Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang

 Conflicts:

	ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java

pom.xml

@@ -15,6 +15,7 @@
         <module>ym-baisc</module>
         <module>ym-schedule-task</module>
         <module>ym-influx</module>
+        <module>ym-quality-planning</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -92,17 +93,17 @@
         </dependency>
 
         <!-- influx start-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-actuator-autoconfigure</artifactId>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-actuator-autoconfigure</artifactId>-->
+<!--            <optional>true</optional>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>com.fasterxml.jackson.core</groupId>-->
+<!--                    <artifactId>jackson-databind</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
 
         <!-- influx end-->
 

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

@@ -0,0 +1,125 @@
+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.FactoryDTO;
+import com.cnbm.basic.excel.FactoryExcel;
+import com.cnbm.basic.service.IFactoryService;
+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-13
+ */
+@RestController
+@RequestMapping("/code/factory")
+@Api(tags="工厂 表")
+public class FactoryController {
+    @Autowired
+    private IFactoryService factoryService;
+
+    @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:factory:page')")
+    public Result<PageData<FactoryDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<FactoryDTO> page = factoryService.page(params);
+
+        return new Result<PageData<FactoryDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:factory:info')")
+    public Result<FactoryDTO> get(@PathVariable("id") Long id){
+        FactoryDTO data = factoryService.get(id);
+
+        return new Result<FactoryDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:factory:save')")
+    public Result save(@RequestBody FactoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        factoryService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:factory:update')")
+    public Result update(@RequestBody FactoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        factoryService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:factory:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        factoryService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:factory:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<FactoryDTO> list = factoryService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, FactoryExcel.class);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("改变状态")
+    @LogOperation("改变状态")
+    public Result changeStatus(@PathVariable("id") Long id){
+        factoryService.changeStatus(id);
+
+        return new Result();
+    }
+
+}

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

@@ -0,0 +1,116 @@
+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.MachineDTO;
+import com.cnbm.basic.excel.MachineExcel;
+import com.cnbm.basic.service.IMachineService;
+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-15
+ */
+@RestController
+@RequestMapping("/code/machine")
+@Api(tags="机台表")
+public class MachineController {
+    @Autowired
+    private IMachineService machineService;
+
+    @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:machine:page')")
+    public Result<PageData<MachineDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<MachineDTO> page = machineService.page(params);
+
+        return new Result<PageData<MachineDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:machine:info')")
+    public Result<MachineDTO> get(@PathVariable("id") Long id){
+        MachineDTO data = machineService.get(id);
+
+        return new Result<MachineDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:machine:save')")
+    public Result save(@RequestBody MachineDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        machineService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:machine:update')")
+    public Result update(@RequestBody MachineDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        machineService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:machine:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        machineService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:machine:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<MachineDTO> list = machineService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, MachineExcel.class);
+    }
+
+}

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

@@ -0,0 +1,124 @@
+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.MeasureToolDTO;
+import com.cnbm.basic.excel.MeasureToolExcel;
+import com.cnbm.basic.service.IMeasureToolService;
+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-13
+ */
+@RestController
+@RequestMapping("/code/measureTool")
+@Api(tags="量具表")
+public class MeasureToolController {
+    @Autowired
+    private IMeasureToolService measureToolService;
+
+    @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:measureTool:page')")
+    public Result<PageData<MeasureToolDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<MeasureToolDTO> page = measureToolService.page(params);
+
+        return new Result<PageData<MeasureToolDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:measureTool:info')")
+    public Result<MeasureToolDTO> get(@PathVariable("id") Long id){
+        MeasureToolDTO data = measureToolService.get(id);
+
+        return new Result<MeasureToolDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:measureTool:save')")
+    public Result save(@RequestBody MeasureToolDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        measureToolService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:measureTool:update')")
+    public Result update(@RequestBody MeasureToolDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        measureToolService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:measureTool:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        measureToolService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:measureTool:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<MeasureToolDTO> list = measureToolService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, MeasureToolExcel.class);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("改变状态")
+    @LogOperation("改变状态")
+    public Result changeStatus(@PathVariable("id") Long id){
+        measureToolService.changeStatus(id);
+
+        return new Result();
+    }
+}

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

@@ -0,0 +1,116 @@
+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.PlatformDTO;
+import com.cnbm.basic.excel.PlatformExcel;
+import com.cnbm.basic.service.IPlatformService;
+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-13
+ */
+@RestController
+@RequestMapping("/code/platform")
+@Api(tags="站点表")
+public class PlatformController {
+    @Autowired
+    private IPlatformService platformService;
+
+    @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:platform:page')")
+    public Result<PageData<PlatformDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<PlatformDTO> page = platformService.page(params);
+
+        return new Result<PageData<PlatformDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:platform:info')")
+    public Result<PlatformDTO> get(@PathVariable("id") Long id){
+        PlatformDTO data = platformService.get(id);
+
+        return new Result<PlatformDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:platform:save')")
+    public Result save(@RequestBody PlatformDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        platformService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:platform:update')")
+    public Result update(@RequestBody PlatformDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        platformService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:platform:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        platformService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:platform:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PlatformDTO> list = platformService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, PlatformExcel.class);
+    }
+
+}

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

@@ -0,0 +1,116 @@
+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.ProductFeaturesHisDTO;
+import com.cnbm.basic.excel.ProductFeaturesHisExcel;
+import com.cnbm.basic.service.IProductFeaturesHisService;
+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-15
+ */
+@RestController
+@RequestMapping("/code/productFeaturesHis")
+@Api(tags="产品特性 历史表")
+public class ProductFeaturesHisController {
+    @Autowired
+    private IProductFeaturesHisService productFeaturesHisService;
+
+    @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:productFeaturesHis:page')")
+    public Result<PageData<ProductFeaturesHisDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<ProductFeaturesHisDTO> page = productFeaturesHisService.page(params);
+
+        return new Result<PageData<ProductFeaturesHisDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:info')")
+    public Result<ProductFeaturesHisDTO> get(@PathVariable("id") Long id){
+        ProductFeaturesHisDTO data = productFeaturesHisService.get(id);
+
+        return new Result<ProductFeaturesHisDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:save')")
+    public Result save(@RequestBody ProductFeaturesHisDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        productFeaturesHisService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:update')")
+    public Result update(@RequestBody ProductFeaturesHisDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        productFeaturesHisService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        productFeaturesHisService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:productFeaturesHis:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ProductFeaturesHisDTO> list = productFeaturesHisService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, ProductFeaturesHisExcel.class);
+    }
+
+}

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

@@ -40,6 +40,7 @@ public class ProductTypeController {
     @Autowired
     private IProductTypeService productTypeService;
 
+
     @GetMapping("page")
     @ApiOperation("分页")
     @ApiImplicitParams({
@@ -113,4 +114,13 @@ public class ProductTypeController {
         ExcelUtils.exportExcelToTarget(response, null, list, ProductTypeExcel.class);
     }
 
+    @GetMapping("{id}")
+    @ApiOperation("改变状态")
+    @LogOperation("改变状态")
+    public Result changeStatus(@PathVariable("id") Long id){
+        productTypeService.changeStatus(id);
+
+        return new Result();
+    }
+
 }

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

@@ -0,0 +1,116 @@
+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.ProductWorkingprocedureRelationDTO;
+import com.cnbm.basic.excel.ProductWorkingprocedureRelationExcel;
+import com.cnbm.basic.service.IProductWorkingprocedureRelationService;
+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-15
+ */
+@RestController
+@RequestMapping("/code/productWorkingprocedureRelation")
+@Api(tags="工序 表")
+public class ProductWorkingprocedureRelationController {
+    @Autowired
+    private IProductWorkingprocedureRelationService productWorkingprocedureRelationService;
+
+    @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:productWorkingprocedureRelation:page')")
+    public Result<PageData<ProductWorkingprocedureRelationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<ProductWorkingprocedureRelationDTO> page = productWorkingprocedureRelationService.page(params);
+
+        return new Result<PageData<ProductWorkingprocedureRelationDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @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
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:save')")
+    public Result save(@RequestBody ProductWorkingprocedureRelationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        productWorkingprocedureRelationService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:update')")
+    public Result update(@RequestBody ProductWorkingprocedureRelationDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        productWorkingprocedureRelationService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        productWorkingprocedureRelationService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:productWorkingprocedureRelation:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ProductWorkingprocedureRelationDTO> list = productWorkingprocedureRelationService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, ProductWorkingprocedureRelationExcel.class);
+    }
+
+}

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

@@ -0,0 +1,116 @@
+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.ShiftDTO;
+import com.cnbm.basic.excel.ShiftExcel;
+import com.cnbm.basic.service.IShiftService;
+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-13
+ */
+@RestController
+@RequestMapping("/code/shift")
+@Api(tags="班次 表")
+public class ShiftController {
+    @Autowired
+    private IShiftService shiftService;
+
+    @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:shift:page')")
+    public Result<PageData<ShiftDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<ShiftDTO> page = shiftService.page(params);
+
+        return new Result<PageData<ShiftDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:shift:info')")
+    public Result<ShiftDTO> get(@PathVariable("id") Long id){
+        ShiftDTO data = shiftService.get(id);
+
+        return new Result<ShiftDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:shift:save')")
+    public Result save(@RequestBody ShiftDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        shiftService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:shift:update')")
+    public Result update(@RequestBody ShiftDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        shiftService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:shift:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        shiftService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:shift:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ShiftDTO> list = shiftService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, ShiftExcel.class);
+    }
+
+}

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

@@ -0,0 +1,116 @@
+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.TeamDTO;
+import com.cnbm.basic.excel.TeamExcel;
+import com.cnbm.basic.service.ITeamService;
+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-13
+ */
+@RestController
+@RequestMapping("/code/team")
+@Api(tags="班组 表")
+public class TeamController {
+    @Autowired
+    private ITeamService teamService;
+
+    @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:team:page')")
+    public Result<PageData<TeamDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<TeamDTO> page = teamService.page(params);
+
+        return new Result<PageData<TeamDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:team:info')")
+    public Result<TeamDTO> get(@PathVariable("id") Long id){
+        TeamDTO data = teamService.get(id);
+
+        return new Result<TeamDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:team:save')")
+    public Result save(@RequestBody TeamDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        teamService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:team:update')")
+    public Result update(@RequestBody TeamDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        teamService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:team:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        teamService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:team:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<TeamDTO> list = teamService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, TeamExcel.class);
+    }
+
+}

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

@@ -113,4 +113,13 @@ public class UnitController {
         ExcelUtils.exportExcelToTarget(response, null, list, UnitExcel.class);
     }
 
+    @GetMapping("{id}")
+    @ApiOperation("改变状态")
+    @LogOperation("改变状态")
+    public Result changeStatus(@PathVariable("id") Long id){
+        unitService.changeStatus(id);
+
+        return new Result();
+    }
+
 }

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

@@ -0,0 +1,116 @@
+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.WorkingProcedureDTO;
+import com.cnbm.basic.excel.WorkingProcedureExcel;
+import com.cnbm.basic.service.IWorkingProcedureService;
+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-15
+ */
+@RestController
+@RequestMapping("/code/workingProcedure")
+@Api(tags="工序 表")
+public class WorkingProcedureController {
+    @Autowired
+    private IWorkingProcedureService workingProcedureService;
+
+    @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:workingProcedure:page')")
+    public Result<PageData<WorkingProcedureDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<WorkingProcedureDTO> page = workingProcedureService.page(params);
+
+        return new Result<PageData<WorkingProcedureDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:workingProcedure:info')")
+    public Result<WorkingProcedureDTO> get(@PathVariable("id") Long id){
+        WorkingProcedureDTO data = workingProcedureService.get(id);
+
+        return new Result<WorkingProcedureDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:workingProcedure:save')")
+    public Result save(@RequestBody WorkingProcedureDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        workingProcedureService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:workingProcedure:update')")
+    public Result update(@RequestBody WorkingProcedureDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        workingProcedureService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:workingProcedure:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        workingProcedureService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:workingProcedure:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WorkingProcedureDTO> list = workingProcedureService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, WorkingProcedureExcel.class);
+    }
+
+}

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

@@ -0,0 +1,116 @@
+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.WorkingProcedureTypeDTO;
+import com.cnbm.basic.excel.WorkingProcedureTypeExcel;
+import com.cnbm.basic.service.IWorkingProcedureTypeService;
+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-15
+ */
+@RestController
+@RequestMapping("/code/workingProcedureType")
+@Api(tags="工序类型表 表")
+public class WorkingProcedureTypeController {
+    @Autowired
+    private IWorkingProcedureTypeService workingProcedureTypeService;
+
+    @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:workingProcedureType:page')")
+    public Result<PageData<WorkingProcedureTypeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<WorkingProcedureTypeDTO> page = workingProcedureTypeService.page(params);
+
+        return new Result<PageData<WorkingProcedureTypeDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:workingProcedureType:info')")
+    public Result<WorkingProcedureTypeDTO> get(@PathVariable("id") Long id){
+        WorkingProcedureTypeDTO data = workingProcedureTypeService.get(id);
+
+        return new Result<WorkingProcedureTypeDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:workingProcedureType:save')")
+    public Result save(@RequestBody WorkingProcedureTypeDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        workingProcedureTypeService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:workingProcedureType:update')")
+    public Result update(@RequestBody WorkingProcedureTypeDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        workingProcedureTypeService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:workingProcedureType:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        workingProcedureTypeService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:workingProcedureType:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WorkingProcedureTypeDTO> list = workingProcedureTypeService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, WorkingProcedureTypeExcel.class);
+    }
+
+}

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

@@ -0,0 +1,74 @@
+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;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 工厂 表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+@Data
+@ApiModel(value = "工厂 表DTO对象")
+public class FactoryDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private BigDecimal id;
+
+	@ApiModelProperty(value = "工厂 名")
+	private String name;
+
+	@ApiModelProperty(value = "工厂 编码")
+	private String code;
+
+	@ApiModelProperty(value = "工厂 描述")
+	private String descs;
+
+	@ApiModelProperty(value = "工厂 联系地址")
+	private String address;
+
+	@ApiModelProperty(value = "工厂类型，1-内部工厂；2-供应商")
+	private String type;
+
+	@ApiModelProperty(value = "1 可用，0 不可用")
+	private BigDecimal status;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private BigDecimal valid;
+
+	@ApiModelProperty(value = "创建人")
+	private BigDecimal creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private BigDecimal updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private BigDecimal version;
+
+}

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

@@ -0,0 +1,71 @@
+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;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 机台表
+ *
+ * @author why
+ * @since  2022-07-15
+ */
+@Data
+@ApiModel(value = "机台表DTO对象")
+public class MachineDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private BigDecimal id;
+
+	@ApiModelProperty(value = "机台名")
+	private String name;
+
+	@ApiModelProperty(value = "机台编码")
+	private String code;
+
+	@ApiModelProperty(value = "机台id，关联platform id")
+	private BigDecimal platformId;
+
+	@ApiModelProperty(value = "机台名称，关联platform id")
+	private String platformName;
+
+	@ApiModelProperty(value = "1 可用，0 不可用")
+	private BigDecimal status;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private BigDecimal valid;
+
+	@ApiModelProperty(value = "创建人")
+	private BigDecimal creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private BigDecimal updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private BigDecimal version;
+
+}

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

@@ -0,0 +1,68 @@
+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;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 量具表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+@Data
+@ApiModel(value = "量具表DTO对象")
+public class MeasureToolDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private BigDecimal id;
+
+	@ApiModelProperty(value = "量具 名")
+	private String name;
+
+	@ApiModelProperty(value = "量具 编码")
+	private String code;
+
+	@ApiModelProperty(value = "量具类型；计量型=1 计数型=2")
+	private String type;
+
+	@ApiModelProperty(value = "1 可用，0 不可用")
+	private BigDecimal status;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private BigDecimal valid;
+
+	@ApiModelProperty(value = "创建人")
+	private BigDecimal creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private BigDecimal updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private BigDecimal version;
+
+}

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

@@ -0,0 +1,68 @@
+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;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 站点表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+@Data
+@ApiModel(value = "站点表DTO对象")
+public class PlatformDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private BigDecimal id;
+
+	@ApiModelProperty(value = "站台名")
+	private String name;
+
+	@ApiModelProperty(value = "站台编码")
+	private String code;
+
+	@ApiModelProperty(value = "站台分组")
+	private String group;
+
+	@ApiModelProperty(value = "1 可用，0 不可用")
+	private BigDecimal status;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private BigDecimal valid;
+
+	@ApiModelProperty(value = "创建人")
+	private BigDecimal creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private BigDecimal updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private BigDecimal version;
+
+}

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

@@ -0,0 +1,119 @@
+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;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 产品特性 历史表
+ *
+ * @author why
+ * @since  2022-07-15
+ */
+@Data
+@ApiModel(value = "产品特性 历史表DTO对象")
+public class ProductFeaturesHisDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private BigDecimal id;
+
+	@ApiModelProperty(value = "产品特性id,关联product_features表")
+	private BigDecimal productFeaturesId;
+
+	@ApiModelProperty(value = "产品id,关联product表")
+	private BigDecimal productId;
+
+	@ApiModelProperty(value = "产品特性 名")
+	private String name;
+
+	@ApiModelProperty(value = "产品特性 编码")
+	private String code;
+
+	@ApiModelProperty(value = "产品特性类型：1 计量型；2 计数型")
+	private BigDecimal type;
+
+	@ApiModelProperty(value = "缺陷等级：1 致命缺陷；2 严重缺陷；3.轻微缺陷")
+	private BigDecimal defectLevel;
+
+	@ApiModelProperty(value = "量具id，关联measure_tool表")
+	private BigDecimal measureToolId;
+
+	@ApiModelProperty(value = "单位 id，关联unit表")
+	private BigDecimal unitId;
+
+	@ApiModelProperty(value = "产品特性 规格")
+	private String specifications;
+
+	@ApiModelProperty(value = "检验参数  规格下线")
+	private Float lsl;
+
+	@ApiModelProperty(value = "检验参数  规格中心线")
+	private Float sl;
+
+	@ApiModelProperty(value = "检验参数  规格上线")
+	private Float usl;
+
+	@ApiModelProperty(value = "工序id，关联 working_procedure 表id")
+	private BigDecimal workingProcedureId;
+
+	@ApiModelProperty(value = "（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
+	private BigDecimal inspectionStage;
+
+	@ApiModelProperty(value = "是否需要spc分析，1 yes;0 no")
+	private BigDecimal isSpc;
+
+	@ApiModelProperty(value = "分析图形，关联control_graph表id")
+	private BigDecimal controlGraphId;
+
+	@ApiModelProperty(value = "样本大小，一般2-25之间。 会依据这个size 把所有待分析的数据 组成一个一个样本")
+	private BigDecimal sampleSize;
+
+	@ApiModelProperty(value = "采样频率，只用于展示")
+	private String samplingFrequency;
+
+	@ApiModelProperty(value = "小数位数（限制 检验参数小数点后面位数），这个先放着后续再说。")
+	private BigDecimal decimalPlaces;
+
+	@ApiModelProperty(value = "目标cpk")
+	private Float targetCpk;
+
+	@ApiModelProperty(value = "目标cpk")
+	private Float targetPpk;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private BigDecimal valid;
+
+	@ApiModelProperty(value = "创建人")
+	private BigDecimal creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private BigDecimal updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private BigDecimal version;
+
+}

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

@@ -20,8 +20,6 @@ import java.time.LocalDateTime;
 public class ProductTypeDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-
-
 	@ApiModelProperty(value = "ID")
 	private BigDecimal id;
 

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

@@ -0,0 +1,71 @@
+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;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 工序 表
+ *
+ * @author why
+ * @since  2022-07-15
+ */
+@Data
+@ApiModel(value = "工序 表DTO对象")
+public class ProductWorkingprocedureRelationDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private BigDecimal id;
+
+	@ApiModelProperty(value = "产品id,关联product表")
+	private BigDecimal productId;
+
+	@ApiModelProperty(value = "工序id,关联 working_procedure 表")
+	private BigDecimal workingProcedureId;
+
+	@ApiModelProperty(value = "顺序，工序是有先后顺序的。")
+	private BigDecimal order;
+
+	@ApiModelProperty(value = "检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
+	private BigDecimal inspectionStage;
+
+	@ApiModelProperty(value = "1 可用，0 不可用")
+	private BigDecimal status;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private BigDecimal valid;
+
+	@ApiModelProperty(value = "创建人")
+	private BigDecimal creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private BigDecimal updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private BigDecimal version;
+
+}

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

@@ -0,0 +1,68 @@
+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;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 班次 表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+@Data
+@ApiModel(value = "班次 表DTO对象")
+public class ShiftDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private BigDecimal id;
+
+	@ApiModelProperty(value = "班次 名")
+	private String name;
+
+	@ApiModelProperty(value = "班次 编码")
+	private String code;
+
+	@ApiModelProperty(value = "班次 描述")
+	private String descs;
+
+	@ApiModelProperty(value = "1 可用，0 不可用")
+	private BigDecimal status;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private BigDecimal valid;
+
+	@ApiModelProperty(value = "创建人")
+	private BigDecimal creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private BigDecimal updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private BigDecimal version;
+
+}

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

@@ -0,0 +1,68 @@
+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;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 班组 表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+@Data
+@ApiModel(value = "班组 表DTO对象")
+public class TeamDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private BigDecimal id;
+
+	@ApiModelProperty(value = "班组 名")
+	private String name;
+
+	@ApiModelProperty(value = "班组 编码")
+	private String code;
+
+	@ApiModelProperty(value = "班组 描述")
+	private String descs;
+
+	@ApiModelProperty(value = "1 可用，0 不可用")
+	private BigDecimal status;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private BigDecimal valid;
+
+	@ApiModelProperty(value = "创建人")
+	private BigDecimal creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private BigDecimal updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private BigDecimal version;
+
+}

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

@@ -0,0 +1,77 @@
+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;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 工序 表
+ *
+ * @author why
+ * @since  2022-07-15
+ */
+@Data
+@ApiModel(value = "工序 表DTO对象")
+public class WorkingProcedureDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private BigDecimal id;
+
+	@ApiModelProperty(value = "工序 名")
+	private String name;
+
+	@ApiModelProperty(value = "工序 编码")
+	private String code;
+
+	@ApiModelProperty(value = "工序类型 id,关联working_procedure_type表")
+	private BigDecimal workingProcedureTypeId;
+
+	@ApiModelProperty(value = "工序类型 名,关联working_procedure_type表")
+	private String workingProcedureTypeName;
+
+	@ApiModelProperty(value = "机台(也就是设备)，这个工序对应的设备，可能有一个或者多个，如果多个用逗号隔开，\"id1,id2,......\"")
+	private String machineId;
+
+	@ApiModelProperty(value = "机台(也就是设备)，这个工序对应的设备，可能有一个或者多个，如果多个用逗号隔开，\"id1,id2,......\"")
+	private String machineName;
+
+	@ApiModelProperty(value = "1 可用，0 不可用")
+	private BigDecimal status;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private BigDecimal valid;
+
+	@ApiModelProperty(value = "创建人")
+	private BigDecimal creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private BigDecimal updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private BigDecimal version;
+
+}

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

@@ -0,0 +1,65 @@
+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;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 工序类型表 表
+ *
+ * @author why
+ * @since  2022-07-15
+ */
+@Data
+@ApiModel(value = "工序类型表 表DTO对象")
+public class WorkingProcedureTypeDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private BigDecimal id;
+
+	@ApiModelProperty(value = "工序类型 名")
+	private String name;
+
+	@ApiModelProperty(value = "工序类型 编码")
+	private String code;
+
+	@ApiModelProperty(value = "1 可用，0 不可用")
+	private BigDecimal status;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private BigDecimal valid;
+
+	@ApiModelProperty(value = "创建人")
+	private BigDecimal creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private BigDecimal updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private BigDecimal version;
+
+}

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

@@ -0,0 +1,73 @@
+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;
+import lombok.Data;
+
+/**
+ * <p>
+ * 工厂 表
+ * </p>
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Data
+@ApiModel(value = "Factory对象", description = "工厂 表")
+public class Factory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private BigDecimal id;
+
+    @ApiModelProperty("工厂 名")
+    private String name;
+
+    @ApiModelProperty("工厂 编码")
+    private String code;
+
+    @ApiModelProperty("工厂 描述")
+    private String descs;
+
+    @ApiModelProperty("工厂 联系地址")
+    private String address;
+
+    @ApiModelProperty("工厂类型，1-内部工厂；2-供应商")
+    private String type;
+
+    @ApiModelProperty("1 可用，0 不可用")
+    private BigDecimal status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+
+    @ApiModelProperty("创建人")
+    private BigDecimal creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private BigDecimal updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private BigDecimal version;
+
+
+}

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

@@ -0,0 +1,67 @@
+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;
+import lombok.Data;
+
+/**
+ * <p>
+ * 机台表
+ * </p>
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Data
+@ApiModel(value = "Machine对象", description = "机台表")
+public class Machine implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private BigDecimal id;
+
+    @ApiModelProperty("机台名")
+    private String name;
+
+    @ApiModelProperty("机台编码")
+    private String code;
+
+    @ApiModelProperty("机台id，关联platform id")
+    private BigDecimal platformId;
+
+    @ApiModelProperty("1 可用，0 不可用")
+    private BigDecimal status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+
+    @ApiModelProperty("创建人")
+    private BigDecimal creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private BigDecimal updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private BigDecimal version;
+
+
+}

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

@@ -0,0 +1,69 @@
+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 lombok.Data;
+
+/**
+ * <p>
+ * 量具表
+ * </p>
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Data
+@TableName("measure_tool")
+@ApiModel(value = "MeasureTool对象", description = "量具表")
+public class MeasureTool implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private BigDecimal id;
+
+    @ApiModelProperty("量具 名")
+    private String name;
+
+    @ApiModelProperty("量具 编码")
+    private String code;
+
+    @ApiModelProperty("量具类型；计量型=1 计数型=2")
+    private String type;
+
+    @ApiModelProperty("1 可用，0 不可用")
+    private BigDecimal status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+
+    @ApiModelProperty("创建人")
+    private BigDecimal creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private BigDecimal updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private BigDecimal version;
+
+
+}

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

@@ -0,0 +1,67 @@
+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;
+import lombok.Data;
+
+/**
+ * <p>
+ * 站点表
+ * </p>
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Data
+@ApiModel(value = "Platform对象", description = "站点表")
+public class Platform implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private BigDecimal id;
+
+    @ApiModelProperty("站台名")
+    private String name;
+
+    @ApiModelProperty("站台编码")
+    private String code;
+
+    @ApiModelProperty("站台分组")
+    private String group;
+
+    @ApiModelProperty("1 可用，0 不可用")
+    private BigDecimal status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+
+    @ApiModelProperty("创建人")
+    private BigDecimal creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private BigDecimal updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private BigDecimal version;
+
+
+}

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

@@ -0,0 +1,120 @@
+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 lombok.Data;
+
+/**
+ * <p>
+ * 产品特性 历史表
+ * </p>
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Data
+@TableName("product_features_his")
+@ApiModel(value = "ProductFeaturesHis对象", description = "产品特性 历史表")
+public class ProductFeaturesHis implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private BigDecimal id;
+
+    @ApiModelProperty("产品特性id,关联product_features表")
+    private BigDecimal productFeaturesId;
+
+    @ApiModelProperty("产品id,关联product表")
+    private BigDecimal productId;
+
+    @ApiModelProperty("产品特性 名")
+    private String name;
+
+    @ApiModelProperty("产品特性 编码")
+    private String code;
+
+    @ApiModelProperty("产品特性类型：1 计量型；2 计数型")
+    private BigDecimal type;
+
+    @ApiModelProperty("缺陷等级：1 致命缺陷；2 严重缺陷；3.轻微缺陷")
+    private BigDecimal defectLevel;
+
+    @ApiModelProperty("量具id，关联measure_tool表")
+    private BigDecimal measureToolId;
+
+    @ApiModelProperty("单位 id，关联unit表")
+    private BigDecimal unitId;
+
+    @ApiModelProperty("产品特性 规格")
+    private String specifications;
+
+    @ApiModelProperty("检验参数  规格下线")
+    private Float lsl;
+
+    @ApiModelProperty("检验参数  规格中心线")
+    private Float sl;
+
+    @ApiModelProperty("检验参数  规格上线")
+    private Float usl;
+
+    @ApiModelProperty("工序id，关联 working_procedure 表id")
+    private BigDecimal workingProcedureId;
+
+    @ApiModelProperty("（如果为空就代表4个阶段都不是）检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
+    private BigDecimal inspectionStage;
+
+    @ApiModelProperty("是否需要spc分析，1 yes;0 no")
+    private BigDecimal isSpc;
+
+    @ApiModelProperty("分析图形，关联control_graph表id")
+    private BigDecimal controlGraphId;
+
+    @ApiModelProperty("样本大小，一般2-25之间。 会依据这个size 把所有待分析的数据 组成一个一个样本")
+    private BigDecimal sampleSize;
+
+    @ApiModelProperty("采样频率，只用于展示")
+    private String samplingFrequency;
+
+    @ApiModelProperty("小数位数（限制 检验参数小数点后面位数），这个先放着后续再说。")
+    private BigDecimal decimalPlaces;
+
+    @ApiModelProperty("目标cpk")
+    private Float targetCpk;
+
+    @ApiModelProperty("目标cpk")
+    private Float targetPpk;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+
+    @ApiModelProperty("创建人")
+    private BigDecimal creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private BigDecimal updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private BigDecimal version;
+
+
+}

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

@@ -0,0 +1,72 @@
+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 lombok.Data;
+
+/**
+ * <p>
+ * 工序 表
+ * </p>
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Data
+@TableName("product_workingprocedure_relation")
+@ApiModel(value = "ProductWorkingprocedureRelation对象", description = "工序 表")
+public class ProductWorkingprocedureRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private BigDecimal id;
+
+    @ApiModelProperty("产品id,关联product表")
+    private BigDecimal productId;
+
+    @ApiModelProperty("工序id,关联 working_procedure 表")
+    private BigDecimal workingProcedureId;
+
+    @ApiModelProperty("顺序，工序是有先后顺序的。")
+    private BigDecimal order;
+
+    @ApiModelProperty("检验阶段；1 进货检验、 2 过程检验、 3 成品检验、 4 出货检验;;如果有多个用逗号隔开，比如 1,4 就代表选中了进货检验和出货检验")
+    private BigDecimal inspectionStage;
+
+    @ApiModelProperty("1 可用，0 不可用")
+    private BigDecimal status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+
+    @ApiModelProperty("创建人")
+    private BigDecimal creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private BigDecimal updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private BigDecimal version;
+
+
+}

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

@@ -0,0 +1,67 @@
+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;
+import lombok.Data;
+
+/**
+ * <p>
+ * 班次 表
+ * </p>
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Data
+@ApiModel(value = "Shift对象", description = "班次 表")
+public class Shift implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private BigDecimal id;
+
+    @ApiModelProperty("班次 名")
+    private String name;
+
+    @ApiModelProperty("班次 编码")
+    private String code;
+
+    @ApiModelProperty("班次 描述")
+    private String descs;
+
+    @ApiModelProperty("1 可用，0 不可用")
+    private BigDecimal status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+
+    @ApiModelProperty("创建人")
+    private BigDecimal creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private BigDecimal updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private BigDecimal version;
+
+
+}

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

@@ -0,0 +1,67 @@
+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;
+import lombok.Data;
+
+/**
+ * <p>
+ * 班组 表
+ * </p>
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Data
+@ApiModel(value = "Team对象", description = "班组 表")
+public class Team implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private BigDecimal id;
+
+    @ApiModelProperty("班组 名")
+    private String name;
+
+    @ApiModelProperty("班组 编码")
+    private String code;
+
+    @ApiModelProperty("班组 描述")
+    private String descs;
+
+    @ApiModelProperty("1 可用，0 不可用")
+    private BigDecimal status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+
+    @ApiModelProperty("创建人")
+    private BigDecimal creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private BigDecimal updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private BigDecimal version;
+
+
+}

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

@@ -0,0 +1,72 @@
+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 lombok.Data;
+
+/**
+ * <p>
+ * 工序 表
+ * </p>
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Data
+@TableName("working_procedure")
+@ApiModel(value = "WorkingProcedure对象", description = "工序 表")
+public class WorkingProcedure implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private BigDecimal id;
+
+    @ApiModelProperty("工序 名")
+    private String name;
+
+    @ApiModelProperty("工序 编码")
+    private String code;
+
+    @ApiModelProperty("工序类型 id,关联working_procedure_type表")
+    private BigDecimal workingProcedureTypeId;
+
+    @ApiModelProperty("机台(也就是设备)，这个工序对应的设备，可能有一个或者多个，如果多个用逗号隔开，\"id1,id2,......\"")
+    private String machineId;
+
+    @ApiModelProperty("1 可用，0 不可用")
+    private BigDecimal status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+
+    @ApiModelProperty("创建人")
+    private BigDecimal creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private BigDecimal updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private BigDecimal version;
+
+
+}

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

@@ -0,0 +1,66 @@
+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 lombok.Data;
+
+/**
+ * <p>
+ * 工序类型表 表
+ * </p>
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Data
+@TableName("working_procedure_type")
+@ApiModel(value = "WorkingProcedureType对象", description = "工序类型表 表")
+public class WorkingProcedureType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private BigDecimal id;
+
+    @ApiModelProperty("工序类型 名")
+    private String name;
+
+    @ApiModelProperty("工序类型 编码")
+    private String code;
+
+    @ApiModelProperty("1 可用，0 不可用")
+    private BigDecimal status;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+
+    @ApiModelProperty("创建人")
+    private BigDecimal creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private BigDecimal updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private BigDecimal version;
+
+
+}

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

@@ -0,0 +1,52 @@
+package com.cnbm.basic.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 工厂 表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+@Data
+public class FactoryExcel {
+    @Excel(name = "ID")
+    private BigDecimal id;
+    @Excel(name = "工厂 名")
+    private String name;
+    @Excel(name = "工厂 编码")
+    private String code;
+    @Excel(name = "工厂 描述")
+    private String descs;
+    @Excel(name = "工厂 联系地址")
+    private String address;
+    @Excel(name = "工厂类型，1-内部工厂；2-供应商")
+    private String type;
+    @Excel(name = "1 可用，0 不可用")
+    private BigDecimal status;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+    @Excel(name = "创建人")
+    private BigDecimal creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private BigDecimal updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private BigDecimal version;
+
+}

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

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

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

@@ -0,0 +1,48 @@
+package com.cnbm.basic.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 量具表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+@Data
+public class MeasureToolExcel {
+    @Excel(name = "ID")
+    private BigDecimal id;
+    @Excel(name = "量具 名")
+    private String name;
+    @Excel(name = "量具 编码")
+    private String code;
+    @Excel(name = "量具类型；计量型=1 计数型=2")
+    private String type;
+    @Excel(name = "1 可用，0 不可用")
+    private BigDecimal status;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+    @Excel(name = "创建人")
+    private BigDecimal creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private BigDecimal updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private BigDecimal version;
+
+}

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

@@ -0,0 +1,48 @@
+package com.cnbm.basic.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 站点表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+@Data
+public class PlatformExcel {
+    @Excel(name = "ID")
+    private BigDecimal id;
+    @Excel(name = "站台名")
+    private String name;
+    @Excel(name = "站台编码")
+    private String code;
+    @Excel(name = "站台分组")
+    private String group;
+    @Excel(name = "1 可用，0 不可用")
+    private BigDecimal status;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+    @Excel(name = "创建人")
+    private BigDecimal creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private BigDecimal updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private BigDecimal version;
+
+}

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

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

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

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

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

@@ -0,0 +1,48 @@
+package com.cnbm.basic.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 班次 表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+@Data
+public class ShiftExcel {
+    @Excel(name = "ID")
+    private BigDecimal id;
+    @Excel(name = "班次 名")
+    private String name;
+    @Excel(name = "班次 编码")
+    private String code;
+    @Excel(name = "班次 描述")
+    private String descs;
+    @Excel(name = "1 可用，0 不可用")
+    private BigDecimal status;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+    @Excel(name = "创建人")
+    private BigDecimal creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private BigDecimal updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private BigDecimal version;
+
+}

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

@@ -0,0 +1,48 @@
+package com.cnbm.basic.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 班组 表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+@Data
+public class TeamExcel {
+    @Excel(name = "ID")
+    private BigDecimal id;
+    @Excel(name = "班组 名")
+    private String name;
+    @Excel(name = "班组 编码")
+    private String code;
+    @Excel(name = "班组 描述")
+    private String descs;
+    @Excel(name = "1 可用，0 不可用")
+    private BigDecimal status;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private BigDecimal valid;
+    @Excel(name = "创建人")
+    private BigDecimal creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private BigDecimal updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private BigDecimal version;
+
+}

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

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

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

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

ym-baisc/src/main/java/com/cnbm/basic/mapper/FactoryMapper.java

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

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

@@ -0,0 +1,16 @@
+package com.cnbm.basic.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.basic.entity.Machine;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 机台表
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Mapper
+public interface MachineMapper extends BaseDao<Machine> {
+	
+}

ym-baisc/src/main/java/com/cnbm/basic/mapper/MeasureToolMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.basic.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.basic.entity.MeasureTool;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 量具表
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Mapper
+public interface MeasureToolMapper extends BaseDao<MeasureTool> {
+	
+}

ym-baisc/src/main/java/com/cnbm/basic/mapper/PlatformMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.basic.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.basic.entity.Platform;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 站点表
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Mapper
+public interface PlatformMapper extends BaseDao<Platform> {
+	
+}

ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductFeaturesHisMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.basic.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.basic.entity.ProductFeaturesHis;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 产品特性 历史表
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Mapper
+public interface ProductFeaturesHisMapper extends BaseDao<ProductFeaturesHis> {
+	
+}

ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java

@@ -17,5 +17,5 @@ import java.util.Map;
  */
 @Mapper
 public interface ProductTypeMapper extends BaseDao<ProductType> {
-    IPage<ProductTypeDTO> page(IPage<ProductType> objectPage, @Param("param") Map<String, Object> params);
+    //IPage<ProductTypeDTO> page(IPage<ProductType> objectPage, @Param("param") Map<String, Object> params);
 }

ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.xml

@@ -1,5 +1,75 @@
 <?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.generator.code.mapper.ProductTypeMapper">
+<mapper namespace="com.cnbm.basic.mapper.ProductTypeMapper">
+    <sql id="Base_Column_List">
+            id,
+            `name`,
+            code,
+            descs,
+            `status`,
+            remark,
+            `valid`,
+            creator_id,
+            creator_name,
+            create_time,
+            updater_id,
+            updater_name,
+            update_time,
+            version
+    </sql>
+    <resultMap id="BaseResultMap" type="com.cnbm.basic.entity.ProductType">
+        <result column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="code" property="code"/>
+        <result column="descs" property="descs"/>
+        <result column="status" property="status"/>
+        <result column="remark" property="remark"/>
+        <result column="valid" property="valid"/>
+        <result column="creator_id" property="creatorId"/>
+        <result column="creator_name" property="creatorName"/>
+        <result column="create_time" property="createTime"/>
+        <result column="updater_id" property="updaterId"/>
+        <result column="updater_name" property="updaterName"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="version" property="version"/>
+    </resultMap>
+
+<!--auto generated by MybatisCodeHelper on 2022-07-05-->
+    <insert id="insertList">
+        INSERT INTO product_type(
+        id,
+        name,
+        code,
+        descs,
+        status,
+        remark,
+        valid,
+        creator_id,
+        creator_name,
+        create_time,
+        updater_id,
+        updater_name,
+        update_time,
+        version
+        )VALUES
+        <foreach collection="list" item="element" index="index" separator=",">
+            (
+            #{element.id},
+            #{element.name},
+            #{element.code},
+            #{element.descs},
+            #{element.status},
+            #{element.remark},
+            #{element.valid},
+            #{element.creatorId},
+            #{element.creatorName},
+            #{element.createTime},
+            #{element.updaterId},
+            #{element.updaterName},
+            #{element.updateTime},
+            #{element.version}
+            )
+        </foreach>
+    </insert>
 
 </mapper>

ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductWorkingprocedureRelationMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.basic.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.basic.entity.ProductWorkingprocedureRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 工序 表
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Mapper
+public interface ProductWorkingprocedureRelationMapper extends BaseDao<ProductWorkingprocedureRelation> {
+	
+}

ym-baisc/src/main/java/com/cnbm/basic/mapper/ShiftMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.basic.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.basic.entity.Shift;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 班次 表
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Mapper
+public interface ShiftMapper extends BaseDao<Shift> {
+	
+}

ym-baisc/src/main/java/com/cnbm/basic/mapper/TeamMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.basic.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.basic.entity.Team;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 班组 表
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Mapper
+public interface TeamMapper extends BaseDao<Team> {
+	
+}

ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.xml

@@ -1,5 +1,5 @@
 <?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.generator.code.mapper.UnitMapper">
+<mapper namespace="com.cnbm.basic.mapper.UnitMapper">
 
 </mapper>

ym-baisc/src/main/java/com/cnbm/basic/mapper/WorkingProcedureMapper.java

@@ -0,0 +1,20 @@
+package com.cnbm.basic.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.basic.dto.WorkingProcedureDTO;
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.basic.entity.WorkingProcedure;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Map;
+
+/**
+ * 工序 表
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Mapper
+public interface WorkingProcedureMapper extends BaseDao<WorkingProcedure> {
+    IPage<WorkingProcedureDTO> page(Map<String, Object> params);
+}

ym-baisc/src/main/java/com/cnbm/basic/mapper/WorkingProcedureTypeMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.basic.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.basic.entity.WorkingProcedureType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 工序类型表 表
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Mapper
+public interface WorkingProcedureTypeMapper extends BaseDao<WorkingProcedureType> {
+	
+}

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

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

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

@@ -0,0 +1,28 @@
+package com.cnbm.basic.service;
+
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.CrudService;
+import com.cnbm.basic.dto.MachineDTO;
+import com.cnbm.basic.entity.Machine;
+
+import java.util.Map;
+
+/**
+ * 机台表
+ *
+ * @author why
+ * @since  2022-07-15
+ */
+public interface IMachineService extends CrudService<Machine, MachineDTO> {
+    PageData<MachineDTO> page (Map<String, Object> params);
+
+    MachineDTO get(Long id);
+
+    void save(MachineDTO dto);
+
+    void update(MachineDTO dto);
+
+    void delete(Long[] ids);
+
+    void changeStatus(Long id);
+}

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

@@ -0,0 +1,28 @@
+package com.cnbm.basic.service;
+
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.CrudService;
+import com.cnbm.basic.dto.MeasureToolDTO;
+import com.cnbm.basic.entity.MeasureTool;
+
+import java.util.Map;
+
+/**
+ * 量具表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+public interface IMeasureToolService extends CrudService<MeasureTool, MeasureToolDTO> {
+    PageData<MeasureToolDTO> page (Map<String, Object> params);
+
+    MeasureToolDTO get(Long id);
+
+    void save(MeasureToolDTO dto);
+
+    void update(MeasureToolDTO dto);
+
+    void delete(Long[] ids);
+
+    void changeStatus(Long id);
+}

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

@@ -0,0 +1,28 @@
+package com.cnbm.basic.service;
+
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.CrudService;
+import com.cnbm.basic.dto.PlatformDTO;
+import com.cnbm.basic.entity.Platform;
+
+import java.util.Map;
+
+/**
+ * 站点表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+public interface IPlatformService extends CrudService<Platform, PlatformDTO> {
+    PageData<PlatformDTO> page (Map<String, Object> params);
+
+    PlatformDTO get(Long id);
+
+    void save(PlatformDTO dto);
+
+    void update(PlatformDTO dto);
+
+    void delete(Long[] ids);
+
+    void changeStatus(Long id);
+}

ym-baisc/src/main/java/com/cnbm/basic/service/IProductFeaturesHisService.java

@@ -0,0 +1,26 @@
+package com.cnbm.basic.service;
+
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.CrudService;
+import com.cnbm.basic.dto.ProductFeaturesHisDTO;
+import com.cnbm.basic.entity.ProductFeaturesHis;
+
+import java.util.Map;
+
+/**
+ * 产品特性 历史表
+ *
+ * @author why
+ * @since  2022-07-15
+ */
+public interface IProductFeaturesHisService extends CrudService<ProductFeaturesHis, ProductFeaturesHisDTO> {
+    PageData<ProductFeaturesHisDTO> page (Map<String, Object> params);
+
+    ProductFeaturesHisDTO get(Long id);
+
+    void save(ProductFeaturesHisDTO dto);
+
+    void update(ProductFeaturesHisDTO dto);
+
+    void delete(Long[] ids);
+}

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

@@ -15,4 +15,14 @@ import java.util.Map;
  */
 public interface IProductTypeService extends CrudService<ProductType, ProductTypeDTO> {
     PageData<ProductTypeDTO> page (Map<String, Object> params);
+
+    ProductTypeDTO get(Long id);
+
+    void save(ProductTypeDTO dto);
+
+    void update(ProductTypeDTO dto);
+
+    void delete(Long[] ids);
+
+    void changeStatus(Long id);
 }

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

@@ -0,0 +1,26 @@
+package com.cnbm.basic.service;
+
+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.Map;
+
+/**
+ * 工序 表
+ *
+ * @author why
+ * @since  2022-07-15
+ */
+public interface IProductWorkingprocedureRelationService extends CrudService<ProductWorkingprocedureRelation, ProductWorkingprocedureRelationDTO> {
+    PageData<ProductWorkingprocedureRelationDTO> page (Map<String, Object> params);
+
+    ProductWorkingprocedureRelationDTO get(Long id);
+
+    void save(ProductWorkingprocedureRelationDTO dto);
+
+    void update(ProductWorkingprocedureRelationDTO dto);
+
+    void delete(Long[] ids);
+}

ym-baisc/src/main/java/com/cnbm/basic/service/IShiftService.java

@@ -0,0 +1,26 @@
+package com.cnbm.basic.service;
+
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.CrudService;
+import com.cnbm.basic.dto.ShiftDTO;
+import com.cnbm.basic.entity.Shift;
+
+import java.util.Map;
+
+/**
+ * 班次 表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+public interface IShiftService extends CrudService<Shift, ShiftDTO> {
+    PageData<ShiftDTO> page (Map<String, Object> params);
+
+    ShiftDTO get(Long id);
+
+    void save(ShiftDTO dto);
+
+    void update(ShiftDTO dto);
+
+    void delete(Long[] ids);
+}

ym-baisc/src/main/java/com/cnbm/basic/service/ITeamService.java

@@ -0,0 +1,26 @@
+package com.cnbm.basic.service;
+
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.CrudService;
+import com.cnbm.basic.dto.TeamDTO;
+import com.cnbm.basic.entity.Team;
+
+import java.util.Map;
+
+/**
+ * 班组 表
+ *
+ * @author why
+ * @since  2022-07-13
+ */
+public interface ITeamService extends CrudService<Team, TeamDTO> {
+    PageData<TeamDTO> page (Map<String, Object> params);
+
+    TeamDTO get(Long id);
+
+    void save(TeamDTO dto);
+
+    void update(TeamDTO dto);
+
+    void delete(Long[] ids);
+}

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

@@ -1,9 +1,12 @@
 package com.cnbm.basic.service;
 
+import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
 import com.cnbm.basic.dto.UnitDTO;
 import com.cnbm.basic.entity.Unit;
 
+import java.util.Map;
+
 /**
  * 单位 表
  *
@@ -11,5 +14,13 @@ import com.cnbm.basic.entity.Unit;
  * @since  2022-06-30
  */
 public interface IUnitService extends CrudService<Unit, UnitDTO> {
+    PageData<UnitDTO> page (Map<String, Object> params);
 
+    UnitDTO get(Long id);
+
+    void save(UnitDTO dto);
+
+    void update(UnitDTO dto);
+
+    void changeStatus(Long id);
 }

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

@@ -0,0 +1,28 @@
+package com.cnbm.basic.service;
+
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.CrudService;
+import com.cnbm.basic.dto.WorkingProcedureDTO;
+import com.cnbm.basic.entity.WorkingProcedure;
+
+import java.util.Map;
+
+/**
+ * 工序 表
+ *
+ * @author why
+ * @since  2022-07-15
+ */
+public interface IWorkingProcedureService extends CrudService<WorkingProcedure, WorkingProcedureDTO> {
+    PageData<WorkingProcedureDTO> page (Map<String, Object> params);
+
+    WorkingProcedureDTO get(Long id);
+
+    void save(WorkingProcedureDTO dto);
+
+    void update(WorkingProcedureDTO dto);
+
+    void delete(Long[] ids);
+
+    void changeStatus(Long id);
+}

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

@@ -0,0 +1,28 @@
+package com.cnbm.basic.service;
+
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.CrudService;
+import com.cnbm.basic.dto.WorkingProcedureTypeDTO;
+import com.cnbm.basic.entity.WorkingProcedureType;
+
+import java.util.Map;
+
+/**
+ * 工序类型表 表
+ *
+ * @author why
+ * @since  2022-07-15
+ */
+public interface IWorkingProcedureTypeService extends CrudService<WorkingProcedureType, WorkingProcedureTypeDTO> {
+    PageData<WorkingProcedureTypeDTO> page (Map<String, Object> params);
+
+    WorkingProcedureTypeDTO get(Long id);
+
+    void save(WorkingProcedureTypeDTO dto);
+
+    void update(WorkingProcedureTypeDTO dto);
+
+    void delete(Long[] ids);
+
+    void changeStatus(Long id);
+}

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

@@ -0,0 +1,94 @@
+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.ProductTypeDTO;
+import com.cnbm.basic.entity.ProductType;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.impl.CrudServiceImpl;
+import com.cnbm.basic.dto.FactoryDTO;
+import com.cnbm.basic.mapper.FactoryMapper;
+import com.cnbm.basic.entity.Factory;
+import com.cnbm.basic.service.IFactoryService;
+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.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * 工厂 表
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Service
+public class FactoryServiceImpl extends CrudServiceImpl<FactoryMapper, Factory, FactoryDTO> implements IFactoryService {
+
+    @Override
+    public QueryWrapper<Factory> getWrapper(Map<String, Object> params){
+        String name = (String)params.get("name");
+        String code = (String)params.get("code");
+        String type = (String)params.get("type");
+
+        QueryWrapper<Factory> wrapper = new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(name), "name", name);
+        wrapper.like(StringUtils.isNotBlank(code), "code", code);
+        wrapper.like(StringUtils.isNotBlank(type), "type", type);
+        wrapper.eq(ObjectUtils.isNotNull(params.get("status")), "status", params.get("status"));
+
+        return wrapper;
+    }
+
+    @Override
+    public PageData<FactoryDTO> page (Map<String, Object> params){
+        IPage<Factory> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        return getPageData(page, FactoryDTO.class);
+    }
+
+    @Override
+    public FactoryDTO get(Long id) {
+        Factory entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, FactoryDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(FactoryDTO dto) {
+        Factory entity = ConvertUtils.sourceToTarget(dto, Factory.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(FactoryDTO dto) {
+        Factory entity = ConvertUtils.sourceToTarget(dto, Factory.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long[] ids) {
+        //删除
+        deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void changeStatus(Long id) {
+        //改变状态 开启1 关闭0
+        Factory entity = baseDao.selectById(id);
+        BigDecimal status = entity.getStatus();
+        BigDecimal one = new BigDecimal("1");
+        entity.setStatus(one.subtract(status));
+        updateById(entity);
+    }
+
+}

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

@@ -0,0 +1,96 @@
+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.common.page.PageData;
+import com.cnbm.common.service.impl.CrudServiceImpl;
+import com.cnbm.basic.dto.MachineDTO;
+import com.cnbm.basic.mapper.MachineMapper;
+import com.cnbm.basic.entity.Machine;
+import com.cnbm.basic.service.IMachineService;
+import com.cnbm.common.utils.ConvertUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * 机台表
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Service
+public class MachineServiceImpl extends CrudServiceImpl<MachineMapper, Machine, MachineDTO> implements IMachineService {
+
+    @Override
+    public QueryWrapper<Machine> getWrapper(Map<String, Object> params){
+
+        QueryWrapper<Machine> wrapper = new QueryWrapper<>();
+        wrapper.eq(ObjectUtils.isNotNull(params.get("status")), "status", params.get("status"));
+
+        return wrapper;
+    }
+
+    @Autowired
+    private PlatformServiceImpl platformServiceImpl;
+
+    @Override
+    public PageData<MachineDTO> page (Map<String, Object> params){
+        IPage<Machine> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        PageData<MachineDTO> machineDTOPageData = getPageData(page, MachineDTO.class);
+        if(machineDTOPageData.getTotal()!=0){
+            for(MachineDTO machineDTO:machineDTOPageData.getList()){
+                String platform_name = platformServiceImpl.selectById(machineDTO.getPlatformId()).getName();
+                machineDTO.setPlatformName(platform_name);
+            }
+        }
+        return machineDTOPageData;
+    }
+
+    @Override
+    public MachineDTO get(Long id) {
+        Machine entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, MachineDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(MachineDTO dto) {
+        Machine entity = ConvertUtils.sourceToTarget(dto, Machine.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(MachineDTO dto) {
+        Machine entity = ConvertUtils.sourceToTarget(dto, Machine.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long[] ids) {
+        //删除
+        deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void changeStatus(Long id) {
+        //改变状态 开启1 关闭0
+        Machine entity = baseDao.selectById(id);
+        BigDecimal status = entity.getStatus();
+        BigDecimal one = new BigDecimal("1");
+        entity.setStatus(one.subtract(status));
+        updateById(entity);
+    }
+
+}

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

@@ -0,0 +1,82 @@
+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.common.page.PageData;
+import com.cnbm.common.service.impl.CrudServiceImpl;
+import com.cnbm.basic.dto.MeasureToolDTO;
+import com.cnbm.basic.mapper.MeasureToolMapper;
+import com.cnbm.basic.entity.MeasureTool;
+import com.cnbm.basic.service.IMeasureToolService;
+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.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * 量具表
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Service
+public class MeasureToolServiceImpl extends CrudServiceImpl<MeasureToolMapper, MeasureTool, MeasureToolDTO> implements IMeasureToolService {
+
+    @Override
+    public QueryWrapper<MeasureTool> getWrapper(Map<String, Object> params){
+        String name = (String)params.get("name");
+        String code = (String)params.get("code");
+
+        QueryWrapper<MeasureTool> 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"));
+
+        return wrapper;
+    }
+
+    @Override
+    public PageData<MeasureToolDTO> page (Map<String, Object> params){
+        IPage<MeasureTool> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        return getPageData(page, MeasureToolDTO.class);
+    }
+
+    @Override
+    public MeasureToolDTO get(Long id) {
+        MeasureTool entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, MeasureToolDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(MeasureToolDTO dto) {
+        MeasureTool entity = ConvertUtils.sourceToTarget(dto, MeasureTool.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(MeasureToolDTO dto) {
+        MeasureTool entity = ConvertUtils.sourceToTarget(dto, MeasureTool.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void changeStatus(Long id) {
+        //改变状态 开启1 关闭0
+        MeasureTool entity = baseDao.selectById(id);
+        BigDecimal status = entity.getStatus();
+        BigDecimal one = new BigDecimal("1");
+        entity.setStatus(one.subtract(status));
+        updateById(entity);
+    }
+
+}

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

@@ -0,0 +1,87 @@
+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.common.page.PageData;
+import com.cnbm.common.service.impl.CrudServiceImpl;
+import com.cnbm.basic.dto.PlatformDTO;
+import com.cnbm.basic.mapper.PlatformMapper;
+import com.cnbm.basic.entity.Platform;
+import com.cnbm.basic.service.IPlatformService;
+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.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * 站点表
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Service
+public class PlatformServiceImpl extends CrudServiceImpl<PlatformMapper, Platform, PlatformDTO> implements IPlatformService {
+
+    @Override
+    public QueryWrapper<Platform> getWrapper(Map<String, Object> params){
+
+        QueryWrapper<Platform> wrapper = new QueryWrapper<>();
+        wrapper.eq(ObjectUtils.isNotNull(params.get("status")), "status", params.get("status"));
+
+        return wrapper;
+    }
+
+    @Override
+    public PageData<PlatformDTO> page (Map<String, Object> params){
+        IPage<Platform> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        return getPageData(page, PlatformDTO.class);
+    }
+
+    @Override
+    public PlatformDTO get(Long id) {
+        Platform entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PlatformDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PlatformDTO dto) {
+        Platform entity = ConvertUtils.sourceToTarget(dto, Platform.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PlatformDTO dto) {
+        Platform entity = ConvertUtils.sourceToTarget(dto, Platform.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long[] ids) {
+        //删除
+        deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void changeStatus(Long id) {
+        //改变状态 开启1 关闭0
+        Platform entity = baseDao.selectById(id);
+        BigDecimal status = entity.getStatus();
+        BigDecimal one = new BigDecimal("1");
+        entity.setStatus(one.subtract(status));
+        updateById(entity);
+    }
+
+
+}

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesHisServiceImpl.java

@@ -0,0 +1,67 @@
+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.ProductFeaturesHisDTO;
+import com.cnbm.basic.mapper.ProductFeaturesHisMapper;
+import com.cnbm.basic.entity.ProductFeaturesHis;
+import com.cnbm.basic.service.IProductFeaturesHisService;
+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.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * 产品特性 历史表
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Service
+public class ProductFeaturesHisServiceImpl extends CrudServiceImpl<ProductFeaturesHisMapper, ProductFeaturesHis, ProductFeaturesHisDTO> implements IProductFeaturesHisService {
+
+    @Override
+    public QueryWrapper<ProductFeaturesHis> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<ProductFeaturesHis> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PageData<ProductFeaturesHisDTO> page (Map<String, Object> params){
+        IPage<ProductFeaturesHis> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        return getPageData(page, ProductFeaturesHisDTO.class);
+    }
+
+    @Override
+    public ProductFeaturesHisDTO get(Long id) {
+        ProductFeaturesHis entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProductFeaturesHisDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProductFeaturesHisDTO dto) {
+        ProductFeaturesHis entity = ConvertUtils.sourceToTarget(dto, ProductFeaturesHis.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProductFeaturesHisDTO dto) {
+        ProductFeaturesHis entity = ConvertUtils.sourceToTarget(dto, ProductFeaturesHis.class);
+        updateById(entity);
+    }
+
+}

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

@@ -2,7 +2,10 @@ package com.cnbm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cnbm.admin.dto.SysDictDataDTO;
+import com.cnbm.admin.entity.SysDictDataEntity;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -10,10 +13,14 @@ import com.cnbm.basic.dto.ProductTypeDTO;
 import com.cnbm.basic.entity.ProductType;
 import com.cnbm.basic.mapper.ProductTypeMapper;
 import com.cnbm.basic.service.IProductTypeService;
+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.Arrays;
 import java.util.Map;
 
 /**
@@ -26,25 +33,71 @@ import java.util.Map;
 public class ProductTypeServiceImpl extends CrudServiceImpl<ProductTypeMapper, ProductType, ProductTypeDTO> implements IProductTypeService {
 
 
-    @Autowired
-    private ProductTypeMapper productTypeMapper;
+    //@Autowired
+    //private ProductTypeMapper productTypeMapper;
 
     @Override
     public QueryWrapper<ProductType> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
+        String name = (String)params.get("name");
+        String code = (String)params.get("code");
 
         QueryWrapper<ProductType> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-
+        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"));
         return wrapper;
     }
 
     @Override
     public PageData<ProductTypeDTO> page (Map<String, Object> params){
-        QueryWrapper<ProductTypeDTO> wrapper = new QueryWrapper<>();
-        wrapper.eq("id",params.get("id"));
-        IPage<ProductTypeDTO> page = productTypeMapper.page(getPage(params, Constant.CREATE_DATE, false), params);
-        return getPageData(page,ProductTypeDTO.class);
+        //QueryWrapper<ProductTypeDTO> wrapper = new QueryWrapper<>();
+        //wrapper.eq("id",params.get("id"));
+        //IPage<ProductTypeDTO> page = productTypeMapper.page(getPage(params, Constant.CREATE_DATE, false), params);
+        //return getPageData(page,ProductTypeDTO.class);
+
+        IPage<ProductType> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        return getPageData(page, ProductTypeDTO.class);
+    }
+
+    @Override
+    public ProductTypeDTO get(Long id) {
+        ProductType entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProductTypeDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProductTypeDTO dto) {
+        ProductType entity = ConvertUtils.sourceToTarget(dto, ProductType.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProductTypeDTO dto) {
+        ProductType entity = ConvertUtils.sourceToTarget(dto, ProductType.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long[] ids) {
+        //删除
+        deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void changeStatus(Long id) {
+        //改变状态 开启1 关闭0
+        ProductType entity = baseDao.selectById(id);
+        BigDecimal status = entity.getStatus();
+        BigDecimal one = new BigDecimal("1");
+        entity.setStatus(one.subtract(status));
+        updateById(entity);
     }
 
 }

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

@@ -0,0 +1,66 @@
+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.ProductWorkingprocedureRelationDTO;
+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 org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+
+/**
+ * 工序 表
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Service
+public class ProductWorkingprocedureRelationServiceImpl extends CrudServiceImpl<ProductWorkingprocedureRelationMapper, ProductWorkingprocedureRelation, ProductWorkingprocedureRelationDTO> implements IProductWorkingprocedureRelationService {
+
+    @Override
+    public QueryWrapper<ProductWorkingprocedureRelation> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<ProductWorkingprocedureRelation> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PageData<ProductWorkingprocedureRelationDTO> page (Map<String, Object> params){
+        IPage<ProductWorkingprocedureRelation> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        return getPageData(page, ProductWorkingprocedureRelationDTO.class);
+    }
+
+    @Override
+    public ProductWorkingprocedureRelationDTO get(Long id) {
+        ProductWorkingprocedureRelation entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ProductWorkingprocedureRelationDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ProductWorkingprocedureRelationDTO dto) {
+        ProductWorkingprocedureRelation entity = ConvertUtils.sourceToTarget(dto, ProductWorkingprocedureRelation.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ProductWorkingprocedureRelationDTO dto) {
+        ProductWorkingprocedureRelation entity = ConvertUtils.sourceToTarget(dto, ProductWorkingprocedureRelation.class);
+        updateById(entity);
+    }
+
+}

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ShiftServiceImpl.java

@@ -0,0 +1,75 @@
+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.ShiftDTO;
+import com.cnbm.basic.mapper.ShiftMapper;
+import com.cnbm.basic.entity.Shift;
+import com.cnbm.basic.service.IShiftService;
+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-13
+ */
+@Service
+public class ShiftServiceImpl extends CrudServiceImpl<ShiftMapper, Shift, ShiftDTO> implements IShiftService {
+
+    @Override
+    public QueryWrapper<Shift> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<Shift> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PageData<ShiftDTO> page (Map<String, Object> params){
+
+        IPage<Shift> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        return getPageData(page, ShiftDTO.class);
+    }
+
+    @Override
+    public ShiftDTO get(Long id) {
+        Shift entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ShiftDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ShiftDTO dto) {
+        Shift entity = ConvertUtils.sourceToTarget(dto, Shift.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ShiftDTO dto) {
+        Shift entity = ConvertUtils.sourceToTarget(dto, Shift.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long[] ids) {
+        //删除
+        deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

ym-baisc/src/main/java/com/cnbm/basic/service/impl/TeamServiceImpl.java

@@ -0,0 +1,77 @@
+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.ProductTypeDTO;
+import com.cnbm.basic.entity.ProductType;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.impl.CrudServiceImpl;
+import com.cnbm.basic.dto.TeamDTO;
+import com.cnbm.basic.mapper.TeamMapper;
+import com.cnbm.basic.entity.Team;
+import com.cnbm.basic.service.ITeamService;
+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.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * 班组 表
+ *
+ * @author why
+ * @since 2022-07-13
+ */
+@Service
+public class TeamServiceImpl extends CrudServiceImpl<TeamMapper, Team, TeamDTO> implements ITeamService {
+
+    @Override
+    public QueryWrapper<Team> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<Team> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PageData<TeamDTO> page (Map<String, Object> params){
+        IPage<Team> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        return getPageData(page, TeamDTO.class);
+    }
+
+    @Override
+    public TeamDTO get(Long id) {
+        Team entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, TeamDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(TeamDTO dto) {
+        Team entity = ConvertUtils.sourceToTarget(dto, Team.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(TeamDTO dto) {
+        Team entity = ConvertUtils.sourceToTarget(dto, Team.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long[] ids) {
+        //删除
+        deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

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

@@ -1,14 +1,19 @@
 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.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.UnitDTO;
 import com.cnbm.basic.entity.Unit;
 import com.cnbm.basic.mapper.UnitMapper;
 import com.cnbm.basic.service.IUnitService;
-import org.apache.commons.lang3.StringUtils;
+import com.cnbm.common.utils.ConvertUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 /**
@@ -22,13 +27,50 @@ public class UnitServiceImpl extends CrudServiceImpl<UnitMapper, Unit, UnitDTO>
 
     @Override
     public QueryWrapper<Unit> getWrapper(Map<String, Object> params){
-        String id = (String)params.get("id");
 
         QueryWrapper<Unit> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+        wrapper.eq(ObjectUtils.isNotNull(params.get("status")), "status", params.get("status"));
 
         return wrapper;
     }
 
+    @Override
+    public PageData<UnitDTO> page (Map<String, Object> params){
+        IPage<Unit> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        return getPageData(page, UnitDTO.class);
+    }
 
+    @Override
+    public UnitDTO get(Long id) {
+        Unit entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, UnitDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(UnitDTO dto) {
+        Unit entity = ConvertUtils.sourceToTarget(dto, Unit.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(UnitDTO dto) {
+        Unit entity = ConvertUtils.sourceToTarget(dto, Unit.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void changeStatus(Long id) {
+        //改变状态 开启1 关闭0
+        Unit entity = baseDao.selectById(id);
+        BigDecimal status = entity.getStatus();
+        BigDecimal one = new BigDecimal("1");
+        entity.setStatus(one.subtract(status));
+        updateById(entity);
+    }
 }

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

@@ -0,0 +1,121 @@
+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.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;
+import com.cnbm.basic.mapper.WorkingProcedureMapper;
+import com.cnbm.basic.entity.WorkingProcedure;
+import com.cnbm.basic.service.IWorkingProcedureService;
+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.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工序 表
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Service
+public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedureMapper, WorkingProcedure, WorkingProcedureDTO> implements IWorkingProcedureService {
+
+    @Override
+    public QueryWrapper<WorkingProcedure> getWrapper(Map<String, Object> params){
+        String name = (String)params.get("name");
+        String code = (String)params.get("code");
+
+        QueryWrapper<WorkingProcedure> 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"));
+
+        return wrapper;
+    }
+
+    @Autowired
+    private MachineServiceImpl machineServiceImpl;
+
+    @Autowired
+    private WorkingProcedureTypeServiceImpl workingProcedureTypeServiceImpl;
+
+    @Override
+    public PageData<WorkingProcedureDTO> page (Map<String, Object> params){
+        IPage<WorkingProcedure> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        PageData<WorkingProcedureDTO> workingProcedureDTOPageData = getPageData(page, WorkingProcedureDTO.class);
+        if(workingProcedureDTOPageData.getTotal()!=0){
+            for(WorkingProcedureDTO workingProcedureDTO:workingProcedureDTOPageData.getList()){
+                //工序类型 id,关联working_procedure_type表
+                String workingProcedureTypeName = workingProcedureTypeServiceImpl.selectById(workingProcedureDTO.getWorkingProcedureTypeId()).getName();
+                workingProcedureDTO.setWorkingProcedureTypeName(workingProcedureTypeName);
+                if(StringUtils.isNotBlank(workingProcedureDTO.getMachineId())){
+                    String[] machineIdList = workingProcedureDTO.getMachineId().split(",");
+                    List<String> machineList = new ArrayList<>();
+                    for(String machineId:machineIdList){
+                        //QueryWrapper<Machine> machineQueryWrapper = new QueryWrapper<>();
+                        //machineQueryWrapper.eq(StringUtils.isNotBlank(machineId), "id", machineId);
+                        String machineName = machineServiceImpl.selectById(machineId).getName();
+                        machineList.add(machineName);
+                    }
+                    String machineNameList = String.join(",", machineList);
+                    workingProcedureDTO.setMachineName(machineNameList);
+                }
+            }
+        }
+        return workingProcedureDTOPageData;
+    }
+
+    @Override
+    public WorkingProcedureDTO get(Long id) {
+        WorkingProcedure entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, WorkingProcedureDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(WorkingProcedureDTO dto) {
+        WorkingProcedure entity = ConvertUtils.sourceToTarget(dto, WorkingProcedure.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(WorkingProcedureDTO dto) {
+        WorkingProcedure entity = ConvertUtils.sourceToTarget(dto, WorkingProcedure.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long[] ids) {
+        //删除
+        deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void changeStatus(Long id) {
+        //改变状态 开启1 关闭0
+        WorkingProcedure entity = baseDao.selectById(id);
+        BigDecimal status = entity.getStatus();
+        BigDecimal one = new BigDecimal("1");
+        entity.setStatus(one.subtract(status));
+        updateById(entity);
+    }
+
+}

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

@@ -0,0 +1,86 @@
+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.common.page.PageData;
+import com.cnbm.common.service.impl.CrudServiceImpl;
+import com.cnbm.basic.dto.WorkingProcedureTypeDTO;
+import com.cnbm.basic.mapper.WorkingProcedureTypeMapper;
+import com.cnbm.basic.entity.WorkingProcedureType;
+import com.cnbm.basic.service.IWorkingProcedureTypeService;
+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.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * 工序类型表 表
+ *
+ * @author why
+ * @since 2022-07-15
+ */
+@Service
+public class WorkingProcedureTypeServiceImpl extends CrudServiceImpl<WorkingProcedureTypeMapper, WorkingProcedureType, WorkingProcedureTypeDTO> implements IWorkingProcedureTypeService {
+
+    @Override
+    public QueryWrapper<WorkingProcedureType> getWrapper(Map<String, Object> params){
+
+        QueryWrapper<WorkingProcedureType> wrapper = new QueryWrapper<>();
+        wrapper.eq(ObjectUtils.isNotNull(params.get("status")), "status", params.get("status"));
+
+        return wrapper;
+    }
+
+    @Override
+    public PageData<WorkingProcedureTypeDTO> page (Map<String, Object> params){
+        IPage<WorkingProcedureType> page = baseDao.selectPage(
+                getPage(params, "id", true),
+                getWrapper(params)
+        );
+        return getPageData(page, WorkingProcedureTypeDTO.class);
+    }
+
+    @Override
+    public WorkingProcedureTypeDTO get(Long id) {
+        WorkingProcedureType entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, WorkingProcedureTypeDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(WorkingProcedureTypeDTO dto) {
+        WorkingProcedureType entity = ConvertUtils.sourceToTarget(dto, WorkingProcedureType.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(WorkingProcedureTypeDTO dto) {
+        WorkingProcedureType entity = ConvertUtils.sourceToTarget(dto, WorkingProcedureType.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long[] ids) {
+        //删除
+        deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void changeStatus(Long id) {
+        //改变状态 开启1 关闭0
+        WorkingProcedureType entity = baseDao.selectById(id);
+        BigDecimal status = entity.getStatus();
+        BigDecimal one = new BigDecimal("1");
+        entity.setStatus(one.subtract(status));
+        updateById(entity);
+    }
+
+}

ym-baisc/src/main/resources/FactoryMapper.xml

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

ym-baisc/src/main/resources/MachineMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.basic.mapper.MachineMapper">
+
+</mapper>

ym-baisc/src/main/resources/MeasureToolMapper.xml

@@ -0,0 +1,11 @@
+<?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.MeasureToolMapper">
+
+    <select id="page" resultType="com.cnbm.basic.dto.ProductDTO">
+        select  product.*,product_type.name as productType
+        from  product
+        left join product_type  ON product.product_type_id = product_type.id
+    </select>
+
+</mapper>

ym-baisc/src/main/resources/PlatformMapper.xml

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

ym-baisc/src/main/resources/ProductFeaturesHisMapper.xml

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

ym-baisc/src/main/resources/ProductTypeMapper.xml

@@ -2,11 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cnbm.basic.mapper.ProductTypeMapper">
 
-    <select id="page" resultType="com.cnbm.basic.dto.ProductTypeDTO">
-        select *
-        from product_type
-        <where>
-            id = #{id)}
-        </where>
-    </select>
 </mapper>

ym-baisc/src/main/resources/ProductWorkingprocedureRelationMapper.xml

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

ym-baisc/src/main/resources/ShiftMapper.xml

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

ym-baisc/src/main/resources/TeamMapper.xml

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

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

@@ -0,0 +1,101 @@
+package com.cnbm.common.spc.math;
+
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+
+public class Math {
+
+    public static void main(String[] args) {
+//        try(Scanner input = new Scanner(System.in);) {
+//            System.out.print("Enter ten numbers: ");
+//            double[] numbers = new double[10];
+//            for (int i = 0; i < numbers.length; i++)
+//                numbers[i] = input.nextDouble();
+//
+//            System.out.println("The mean is "+getMean(numbers)+
+//                    "\nThe stand deviation is "+getStandDeviation(numbers));
+//        }
+
+        //8.1 10.6 9.8 9.0 9.4 9.3 10.2 11.7
+        double[] d = new double[8];
+        d[0] = new Double(8.1) ;
+        d[1] = new Double(10.6);
+        d[2] = new Double(9.8);
+        d[3] = new Double(9.0);
+        d[4] = new Double(9.4);
+        d[5] = new Double(9.3);
+        d[6] = new Double(10.2);
+        d[7] = new Double(11.7);
+
+        ;
+        System.out.println("均值: "+getMean(d)+",,标准差："+StandardDiviation(d)+",极差："+range(d));
+    }
+
+    //平均值
+    public static double getMean(double...numbers) {
+        return format(getSum(numbers) / numbers.length);
+    }
+
+    //极差
+    public static double range(double[] in) {
+        if (in == null) {
+            throw new NumberFormatException();
+        }
+        double max = Double.MIN_VALUE;
+        double min = Double.MAX_VALUE;
+        for (int i = 0; i < in.length; i++) {
+            max = java.lang.Math.max(max, in[i]);
+            min = java.lang.Math.min(min, in[i]);
+        }
+        return format(max - min);
+        //return Mutil.subtract(max, min);
+    }
+
+    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) {
+        int m=x.length;
+        double sum=0;
+        for(int i=0;i<m;i++){//求和
+            sum+=x[i];
+        }
+        double dAve=sum/m;//求平均值
+        double dVar=0;
+        for(int i=0;i<m;i++){//求方差
+            dVar+=(x[i]-dAve)*(x[i]-dAve);
+        }
+        return format(dVar/m);
+    }
+
+    //标准差σ=sqrt(s^2)
+    public static double StandardDiviation(double[] x) {
+        int m=x.length;
+        double sum=0;
+        for(int i=0;i<m;i++){//求和
+            sum+=x[i];
+        }
+        double dAve=sum/m;//求平均值
+        double dVar=0;
+        for(int i=0;i<m;i++){//求方差
+            dVar+=(x[i]-dAve)*(x[i]-dAve);
+        }
+        return format(java.lang.Math.sqrt(dVar/(m-1)));
+        //return Math.sqrt(dVar/m);
+    }
+
+
+    //前n项和
+    public static double getSum(double...numbers) {
+        double sum = 0.0;
+
+        for (double i : numbers) {
+            sum += i;
+        }
+        return sum;
+    }
+}

ym-common/src/main/java/com/cnbm/common/spc/util/DataUtils.java

@@ -1,4 +1,4 @@
-package com.cnbm.influx.common;
+package com.cnbm.common.spc.util;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -9,9 +9,9 @@ import java.util.List;
 /**
  * @Desc: ""
  * @Author: caixiang
- * @DATE: 2022/6/29 16:23
+ * @DATE: 2022/7/12 14:23
  */
-public class Utils {
+public class DataUtils {
     public static void main(String[] args) {
         ArrayList<Integer> arrs = new ArrayList<>();
 
@@ -64,6 +64,4 @@ public class Utils {
         }
         return result;
     }
-
-
 }

ym-gateway/pom.xml

@@ -37,6 +37,11 @@
             <artifactId>ym-influx</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.cnbm</groupId>
+            <artifactId>ym-quality-planning</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->
 <!--            <artifactId>spring-boot-actuator-autoconfigure</artifactId>-->

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

@@ -112,6 +112,22 @@ public class SwaggerConfig {
                 .securitySchemes(Arrays.asList(new ApiKey("token", "token", "header")));
     }
 
+    @Bean
+    public Docket qualityPlanningApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("ym-quality-planning")
+                .apiInfo(apiInfos("质量规划", "质量规划模块"))
+                .useDefaultResponseMessages(true)
+                .forCodeGeneration(false)
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.cnbm.qualityPlanning"))
+                .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

ym-influx/pom.xml

@@ -23,7 +23,11 @@
             <artifactId>influxdb-client-java</artifactId>
             <version>6.3.0</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.cnbm</groupId>
+            <artifactId>ym-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
         <!--- begin -->
 <!--        <dependency>-->

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

@@ -60,16 +60,17 @@ public enum InfluxClient {
      *      true    服务正常健康
      *      false   异常
      */
-    private boolean ping() {
+    public boolean ping() {
         boolean isConnected = false;
         Boolean pong;
         try {
             pong = influxDBClient.ping();
             if (pong != null) {
-                isConnected = true;
+                isConnected = pong;
             }
         } catch (Exception e) {
             e.printStackTrace();
+            return false;
         }
         return isConnected;
     }

ym-influx/src/main/java/com/cnbm/influx/controller/S7DemoController.java

@@ -1,10 +1,17 @@
 package com.cnbm.influx.controller;
 
+import com.cnbm.common.spc.util.DataUtils;
 import com.cnbm.influx.config.InfluxClient;
+import com.cnbm.influx.param.PageInfo;
+import com.cnbm.influx.param.QueryDataParam;
+import com.cnbm.influx.param.Range;
+import com.cnbm.influx.param.Tag;
 import com.cnbm.influx.template.Event;
 import com.influxdb.client.InfluxDBClient;
 import com.influxdb.client.domain.WritePrecision;
 import com.influxdb.client.write.Point;
+import com.influxdb.query.FluxRecord;
+import com.influxdb.query.FluxTable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,47 +19,88 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
 
 @RestController
 @RequestMapping("/influx")
 public class S7DemoController {
     private static final Logger logger = LoggerFactory.getLogger(S7DemoController.class);
 
-    @Autowired
-    InfluxDBClient influxDBClient;
-
-
-//       try (WriteApi writeApi = influxDBClient.makeWriteApi()) {
-//            Temperature temperature = new Temperature();
-//            temperature.setLocation("east");
-//            temperature.setValue(106.2D);
-//            temperature.setTime(Instant.now());
-//            writeApi.writeMeasurement(WritePrecision.NS,temperature);
-//        }
-//
-//        try (WriteApi writeApi = influxDBClient.makeWriteApi()) {
-//            Point point = Point.measurement("temperature")
-//                    .addTag("location","south")
-//                    .addTag("owner","wxm")
-//                    .addField("wxm",230.8);
-//            writeApi.writePoint(point);
-//        }
-
 
     @PostMapping("/insertBatch")
     public void insertBatch() throws InterruptedException {
-//        List<Event> list = new ArrayList<>();
-//
-//        for(int i=0;i<99;i++){
-//            //Thread.sleep(1000);
-//            Event event = new Event();
-//            event.time = Instant.now();
-//            event.transationId = "asas"+i;
-//            event.argName = "arg5";
-//            event.argValue = new Double(i);
-//            list.add(event);
-//        }
-//        influxService.batchInsert(list);
+        List<Event> list = new ArrayList<>();
+
+        for(int i=0;i<99;i++){
+            Thread.sleep(100);
+            Event event = new Event();
+            event.setTime(Instant.now());
+            event.setTransationId("asas"+i);
+            event.setArgName("arg7");
+            event.setArgValue(new Double(i));
+            list.add(event);
+        }
+        InfluxClient.Client.batchInsert(list,"ASProcessCompleteEventAS");
+    }
+
+    /**
+     * 测试连接是否正常
+     *
+     * @return
+     *      true    服务正常健康
+     *      false   异常
+     */
+    @PostMapping("/ping")
+    public void ping() throws InterruptedException {
+        boolean ping = InfluxClient.Client.ping();
+        System.out.println(ping);
+    }
+
+    @PostMapping("/query")
+    public void query() throws InterruptedException {
+        List<Event> list = new ArrayList<>();
+
+        QueryDataParam queryDataParam = new QueryDataParam();
+        queryDataParam.setBucket("qgs-bucket");
+        queryDataParam.setMeasurement("ASProcessCompleteEventAS");
+        queryDataParam.setDropedTagName("transationId");
+        queryDataParam.setTag(new Tag("argName","arg6"));
+        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(),Instant.now()));
+        queryDataParam.setPageInfo(new PageInfo(1,10));
+        List<FluxTable> query = InfluxClient.Client.query(queryDataParam);
+
+
+        for (FluxTable fluxTable : query) {
+            List<FluxRecord> records = fluxTable.getRecords();
+            for (FluxRecord fluxRecord : records) {
+                System.out.println("value: " + fluxRecord.getValueByKey("_value"));
+
+            }
+        }
+        System.out.println();
+    }
+
+    public static void main(String[] args) {
+        List<Event> list = new ArrayList<>();
+
+        QueryDataParam queryDataParam = new QueryDataParam();
+        queryDataParam.setBucket("qgs-bucket");
+        queryDataParam.setMeasurement("ASProcessCompleteEventAS");
+        queryDataParam.setDropedTagName("transationId");
+        queryDataParam.setTag(new Tag("argName","arg7"));
+        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(10).toInstant(),Instant.now()));
+        queryDataParam.setPageInfo(new PageInfo(2,10));
+        List<FluxTable> query = InfluxClient.Client.query(queryDataParam);
+
+
+        for (FluxTable fluxTable : query) {
+            List<FluxRecord> records = fluxTable.getRecords();
+            for (FluxRecord fluxRecord : records) {
+                System.out.println("value: " + fluxRecord.getValueByKey("_value"));
+
+            }
+        }
     }
 
 
@@ -71,8 +119,8 @@ public class S7DemoController {
         event.setTime(Instant.now());
         event.setTransationId("asasd11");
         event.setArgName("argName11");
-        event.setArgValue(7d);
+        event.setArgValue(900001d);
         Point asProcessCompleteEvent = insert(event, "ASProcessCompleteEvent");
-        influxDBClient.makeWriteApi().writePoint(asProcessCompleteEvent);
+        InfluxClient.Client.insert(event,"ASProcessCompleteEvent");
     }
 }

ym-influx/src/main/java/com/cnbm/influx/health/InfluxDB2HealthIndicator.java

@@ -1,55 +0,0 @@
-/*
- * The MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package com.cnbm.influx.health;
-
-import com.influxdb.client.InfluxDBClient;
-import org.springframework.boot.actuate.health.AbstractHealthIndicator;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.util.Assert;
-
-/**
- * {@link //HealthIndicator} for InfluxDB 2.
- *
- * @author Jakub Bednar (bednar@github)
- */
-public class InfluxDB2HealthIndicator extends AbstractHealthIndicator {
-
-    private final InfluxDBClient influxDBClient;
-
-    public InfluxDB2HealthIndicator(final InfluxDBClient influxDBClient) {
-        super("InfluxDBClient 2 health check failed");
-        Assert.notNull(influxDBClient, "InfluxDBClient must not be null");
-
-        this.influxDBClient = influxDBClient;
-    }
-
-    @Override
-    protected void doHealthCheck(final Health.Builder builder) {
-        boolean success = this.influxDBClient.ping();
-
-        if (success) {
-            builder.up();
-        } else {
-            builder.down();
-        }
-    }
-}

ym-influx/src/main/java/com/cnbm/influx/health/InfluxDB2HealthIndicatorAutoConfiguration.java

@@ -1,58 +0,0 @@
-/*
- * The MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package com.cnbm.influx.health;
-
-import com.cnbm.influx.influx.InfluxDB2AutoConfiguration;
-import com.influxdb.client.InfluxDBClient;
-import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
-import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
-import org.springframework.boot.actuate.health.HealthContributor;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.Map;
-
-/**
- * {@link EnableAutoConfiguration Auto-configuration} for {@link InfluxDB2HealthIndicator}.
- *
- * @author Jakub Bednar
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnClass(InfluxDBClient.class)
-@ConditionalOnBean(InfluxDBClient.class)
-@ConditionalOnEnabledHealthIndicator("influx")
-@AutoConfigureAfter(InfluxDB2AutoConfiguration.class)
-public class InfluxDB2HealthIndicatorAutoConfiguration
-        extends CompositeHealthContributorConfiguration<InfluxDB2HealthIndicator, InfluxDBClient> {
-
-    @Bean
-    @ConditionalOnMissingBean(name = { "influxDB2HealthIndicator", "influxDB2HealthContributor" })
-    public HealthContributor influxDbHealthContributor(final Map<String, InfluxDBClient> influxDBClients) {
-        return createContributor(influxDBClients);
-    }
-
-}

ym-influx/src/main/java/com/cnbm/influx/influx/AbstractInfluxDB2AutoConfiguration.java

@@ -1,71 +0,0 @@
-/*
- * The MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package com.cnbm.influx.influx;
-
-import com.influxdb.client.InfluxDBClientOptions;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
-import org.springframework.util.StringUtils;
-
-import javax.annotation.Nonnull;
-import java.util.Collections;
-
-/**
- * @author Jakub Bednar (04/08/2021 11:41)
- */
-abstract class AbstractInfluxDB2AutoConfiguration {
-    protected final InfluxDB2Properties properties;
-    protected final InfluxDB2OkHttpClientBuilderProvider builderProvider;
-
-    protected AbstractInfluxDB2AutoConfiguration(final InfluxDB2Properties properties,
-                                                 final InfluxDB2OkHttpClientBuilderProvider builderProvider) {
-        this.properties = properties;
-        this.builderProvider = builderProvider;
-    }
-
-    @Nonnull
-    protected InfluxDBClientOptions.Builder makeBuilder() {
-        OkHttpClient.Builder okHttpBuilder;
-        if (builderProvider == null) {
-            okHttpBuilder = new OkHttpClient.Builder()
-                    .protocols(Collections.singletonList(Protocol.HTTP_1_1))
-                    .readTimeout(properties.getReadTimeout())
-                    .writeTimeout(properties.getWriteTimeout())
-                    .connectTimeout(properties.getConnectTimeout());
-        } else {
-            okHttpBuilder = builderProvider.get();
-        }
-
-        InfluxDBClientOptions.Builder influxBuilder = InfluxDBClientOptions.builder()
-                .url(properties.getUrl())
-                .bucket(properties.getBucket())
-                .org(properties.getOrg())
-                .okHttpClient(okHttpBuilder);
-
-        if (StringUtils.hasLength(properties.getToken())) {
-            influxBuilder.authenticateToken(properties.getToken().toCharArray());
-        } else if (StringUtils.hasLength(properties.getUsername()) && StringUtils.hasLength(properties.getPassword())) {
-            influxBuilder.authenticate(properties.getUsername(), properties.getPassword().toCharArray());
-        }
-        return influxBuilder;
-    }
-}