From 73efee55e76a9556c8d60ce634087deb3c25ba86 Mon Sep 17 00:00:00 2001 From: yanyang Date: Fri, 5 Aug 2022 16:46:33 +0800 Subject: [PATCH] jh --- .../basic/controller/FactoryController.java | 2 +- .../basic/controller/MachineController.java | 11 ++-- .../basic/controller/PlatformController.java | 2 +- ...uctWorkingprocedureRelationController.java | 4 +- .../cnbm/basic/controller/UnitController.java | 2 +- .../WorkingProcedureController.java | 2 +- .../WorkingProcedureTypeController.java | 2 +- .../ProductWorkingprocedureRelationDTO.java | 4 +- .../ProductWorkingprocedureRelation.java | 4 +- .../com/cnbm/basic/excel/FactoryExcel.java | 54 +++++++++---------- .../com/cnbm/basic/excel/MachineExcel.java | 46 ++++++++-------- .../com/cnbm/basic/excel/PlatformExcel.java | 44 +++++++-------- .../ProductWorkingprocedureRelationExcel.java | 2 +- .../java/com/cnbm/basic/excel/UnitExcel.java | 48 ++++++++--------- .../excel/WorkingProcedureTypeExcel.java | 44 +++++++-------- .../com/cnbm/basic/mapper/FactoryMapper.java | 6 ++- .../com/cnbm/basic/mapper/MachineMapper.java | 6 ++- .../com/cnbm/basic/mapper/PlatformMapper.java | 6 ++- .../cnbm/basic/mapper/ProductTypeMapper.java | 3 ++ .../com/cnbm/basic/mapper/UnitMapper.java | 6 ++- .../basic/mapper/WorkingProcedureMapper.java | 4 +- .../cnbm/basic/service/IFactoryService.java | 3 ++ .../cnbm/basic/service/IMachineService.java | 6 ++- .../cnbm/basic/service/IPlatformService.java | 3 ++ .../basic/service/IProductTypeService.java | 4 ++ .../com/cnbm/basic/service/IUnitService.java | 4 ++ .../service/IWorkingProcedureService.java | 2 + .../service/impl/FactoryServiceImpl.java | 11 ++++ .../service/impl/MachineServiceImpl.java | 16 ++++-- .../service/impl/PlatformServiceImpl.java | 12 +++++ .../service/impl/ProductTypeServiceImpl.java | 13 +++-- .../basic/service/impl/UnitServiceImpl.java | 13 +++++ .../impl/WorkingProcedureServiceImpl.java | 23 ++++++-- .../java/com/cnbm/basic/vo/MachineVo.java | 45 ---------------- .../resources/{ => mapper}/FactoryMapper.xml | 5 ++ .../resources/{ => mapper}/MachineMapper.xml | 13 +++++ .../{ => mapper}/MeasureToolMapper.xml | 0 .../resources/{ => mapper}/PlatformMapper.xml | 5 ++ .../ProductFactoryRelationMapper.xml | 0 .../{ => mapper}/ProductFeaturesHisMapper.xml | 0 .../{ => mapper}/ProductFeaturesMapper.xml | 0 .../resources/{ => mapper}/ProductMapper.xml | 0 .../{ => mapper}/ProductTypeMapper.xml | 5 ++ .../ProductWorkingprocedureRelationMapper.xml | 0 .../resources/{ => mapper}/ShiftMapper.xml | 0 .../resources/{ => mapper}/TeamMapper.xml | 0 .../resources/{ => mapper}/UnitMapper.xml | 5 ++ .../{ => mapper}/WorkingProcedureMapper.xml | 5 ++ 48 files changed, 295 insertions(+), 200 deletions(-) delete mode 100644 ym-baisc/src/main/java/com/cnbm/basic/vo/MachineVo.java rename ym-baisc/src/main/resources/{ => mapper}/FactoryMapper.xml (61%) rename ym-baisc/src/main/resources/{ => mapper}/MachineMapper.xml (69%) rename ym-baisc/src/main/resources/{ => mapper}/MeasureToolMapper.xml (100%) rename ym-baisc/src/main/resources/{ => mapper}/PlatformMapper.xml (61%) rename ym-baisc/src/main/resources/{ => mapper}/ProductFactoryRelationMapper.xml (100%) rename ym-baisc/src/main/resources/{ => mapper}/ProductFeaturesHisMapper.xml (100%) rename ym-baisc/src/main/resources/{ => mapper}/ProductFeaturesMapper.xml (100%) rename ym-baisc/src/main/resources/{ => mapper}/ProductMapper.xml (100%) rename ym-baisc/src/main/resources/{ => mapper}/ProductTypeMapper.xml (60%) rename ym-baisc/src/main/resources/{ => mapper}/ProductWorkingprocedureRelationMapper.xml (100%) rename ym-baisc/src/main/resources/{ => mapper}/ShiftMapper.xml (100%) rename ym-baisc/src/main/resources/{ => mapper}/TeamMapper.xml (100%) rename ym-baisc/src/main/resources/{ => mapper}/UnitMapper.xml (62%) rename ym-baisc/src/main/resources/{ => mapper}/WorkingProcedureMapper.xml (59%) diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java index 15e73ba..ba8637b 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java @@ -115,7 +115,7 @@ public class FactoryController { public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = factoryService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, FactoryExcel.class); + ExcelUtils.exportExcelToTarget(response, "Factory", list, FactoryExcel.class); } @PostMapping("status") diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java index dcb83b8..45a4c3d 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/MachineController.java @@ -2,7 +2,6 @@ package com.cnbm.basic.controller; import com.cnbm.admin.annotation.LogOperation; import com.cnbm.admin.params.IdParam; -import com.cnbm.basic.vo.MachineVo; import com.cnbm.common.constant.Constant; import com.cnbm.common.page.PageData; import com.cnbm.common.utils.ExcelUtils; @@ -58,6 +57,7 @@ public class MachineController { return new Result>().ok(page); } + /* @GetMapping("page2") @ApiOperation("分页2") @ApiImplicitParams({ @@ -68,11 +68,12 @@ public class MachineController { @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataTypeClass = Integer.class) }) //@PreAuthorize("@ex.hasAuthority('code:machine:page')") - public Result> page2(@ApiIgnore @RequestParam Map params){ - PageData page = machineService.page1(params); + public Result> page2(@ApiIgnore @RequestParam Map params){ + PageData page = machineService.page1(params); - return new Result>().ok(page); + return new Result>().ok(page); } + */ @GetMapping("{id}") @ApiOperation("信息") @@ -129,7 +130,7 @@ public class MachineController { public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = machineService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, MachineExcel.class); + ExcelUtils.exportExcelToTarget(response, "Machine", list, MachineExcel.class); } @PostMapping("status") diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java index 5d42aa2..8d86aee 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/PlatformController.java @@ -112,7 +112,7 @@ public class PlatformController { public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = platformService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, PlatformExcel.class); + ExcelUtils.exportExcelToTarget(response, "Platform", list, PlatformExcel.class); } @PostMapping("status") diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductWorkingprocedureRelationController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductWorkingprocedureRelationController.java index b4abb1b..88f0c7f 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductWorkingprocedureRelationController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/ProductWorkingprocedureRelationController.java @@ -1,7 +1,5 @@ package com.cnbm.basic.controller; -import com.cnbm.admin.annotation.LogOperation; -import com.cnbm.basic.dto.WorkingProcedureDTO; import com.cnbm.common.constant.Constant; import com.cnbm.common.page.PageData; import com.cnbm.common.utils.ExcelUtils; @@ -115,7 +113,7 @@ public class ProductWorkingprocedureRelationController { ExcelUtils.exportExcelToTarget(response, null, list, ProductWorkingprocedureRelationExcel.class); } - @GetMapping("{productId}") + @GetMapping("getWorkingprocedureByProductId/{productId}") @ApiOperation("查询所有工序 依据产品id") //@LogOperation("查询所有工序 依据产品id") public Result> getWorkingprocedureByProductId(@PathVariable("productId") Long productId){ diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java index 25c759d..28a9eba 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/UnitController.java @@ -112,7 +112,7 @@ public class UnitController { public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = unitService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, UnitExcel.class); + ExcelUtils.exportExcelToTarget(response, "Unit", list, UnitExcel.class); } @PostMapping("status") diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java index 58dbb84..6023c75 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureController.java @@ -126,7 +126,7 @@ public class WorkingProcedureController { return new Result(); } - @GetMapping("getWorkingprocedureByProductId") + @GetMapping("getWorkingprocedureByProductId/{productId}") @ApiOperation("查询所有工序 依据产品id") //@LogOperation("查询所有工序 依据产品id") public Result> getWorkingprocedureByProductId(@PathVariable("productId") Long productId){ diff --git a/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java b/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java index 89a57df..b712e29 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/controller/WorkingProcedureTypeController.java @@ -112,7 +112,7 @@ public class WorkingProcedureTypeController { public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = workingProcedureTypeService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, WorkingProcedureTypeExcel.class); + ExcelUtils.exportExcelToTarget(response, "WorkingProcedureType", list, WorkingProcedureTypeExcel.class); } @PostMapping("status") diff --git a/ym-baisc/src/main/java/com/cnbm/basic/dto/ProductWorkingprocedureRelationDTO.java b/ym-baisc/src/main/java/com/cnbm/basic/dto/ProductWorkingprocedureRelationDTO.java index c6a2e6f..833bedf 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/dto/ProductWorkingprocedureRelationDTO.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/dto/ProductWorkingprocedureRelationDTO.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; * @since 2022-07-15 */ @Data -@ApiModel(value = "工序 表DTO对象") +@ApiModel(value = "产品-工序 关系表DTO对象") public class ProductWorkingprocedureRelationDTO implements Serializable { private static final long serialVersionUID = 1L; @@ -34,7 +34,7 @@ public class ProductWorkingprocedureRelationDTO implements Serializable { private String workingProcedureName; @ApiModelProperty(value = "顺序，工序是有先后顺序的。") - private Integer order; + private Integer sequence; @ApiModelProperty(value = "1 可用，0 不可用") private Integer status; diff --git a/ym-baisc/src/main/java/com/cnbm/basic/entity/ProductWorkingprocedureRelation.java b/ym-baisc/src/main/java/com/cnbm/basic/entity/ProductWorkingprocedureRelation.java index 67daba9..96b373e 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/entity/ProductWorkingprocedureRelation.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/entity/ProductWorkingprocedureRelation.java @@ -18,7 +18,7 @@ import lombok.Data; */ @Data @TableName("product_workingprocedure_relation") -@ApiModel(value = "ProductWorkingprocedureRelation对象", description = "工序 表") +@ApiModel(value = "ProductWorkingprocedureRelation对象", description = "产品-工序 关系表") public class ProductWorkingprocedureRelation implements Serializable { private static final long serialVersionUID = 1L; @@ -33,7 +33,7 @@ public class ProductWorkingprocedureRelation implements Serializable { private Long workingProcedureId; @ApiModelProperty("顺序，工序是有先后顺序的。") - private Integer order; + private Integer sequence; @ApiModelProperty("1 可用，0 不可用") private Integer status; diff --git a/ym-baisc/src/main/java/com/cnbm/basic/excel/FactoryExcel.java b/ym-baisc/src/main/java/com/cnbm/basic/excel/FactoryExcel.java index 5911471..699cfea 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/excel/FactoryExcel.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/excel/FactoryExcel.java @@ -15,37 +15,37 @@ import java.util.Date; */ @Data public class FactoryExcel { - @Excel(name = "ID") - private Long id; - @Excel(name = "工厂 名") +// @Excel(name = "ID") +// private Long id; + @Excel(name = "工厂名称") private String name; - @Excel(name = "工厂 编码") + @Excel(name = "工厂编码") private String code; - @Excel(name = "工厂 描述") + @Excel(name = "描述") private String descs; - @Excel(name = "工厂 联系地址") + @Excel(name = "联系地址") private String address; - @Excel(name = "工厂类型，1-内部工厂；2-供应商") + @Excel(name = "工厂类型") private String type; - @Excel(name = "1 可用，0 不可用") - private Integer status; - @Excel(name = "备注") - private String remark; - @Excel(name = "删除标志，是否有效:1 可用 0不可用") - private Integer valid; - @Excel(name = "创建人") - private Long creatorId; - @Excel(name = "创建人姓名") - private String creatorName; - @Excel(name = "创建时间") - private LocalDateTime createTime; - @Excel(name = "更新人") - private Long updaterId; - @Excel(name = "更新人姓名") - private String updaterName; - @Excel(name = "更新时间") - private LocalDateTime updateTime; - @Excel(name = "版本号") - private Integer version; +// @Excel(name = "1 可用，0 不可用") +// private Integer status; +// @Excel(name = "备注") +// private String remark; +// @Excel(name = "删除标志，是否有效:1 可用 0不可用") +// private Integer valid; +// @Excel(name = "创建人") +// private Long creatorId; +// @Excel(name = "创建人姓名") +// private String creatorName; +// @Excel(name = "创建时间") +// private LocalDateTime createTime; +// @Excel(name = "更新人") +// private Long updaterId; +// @Excel(name = "更新人姓名") +// private String updaterName; +// @Excel(name = "更新时间") +// private LocalDateTime updateTime; +// @Excel(name = "版本号") +// private Integer version; } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/excel/MachineExcel.java b/ym-baisc/src/main/java/com/cnbm/basic/excel/MachineExcel.java index 04d3439..c7fc2d5 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/excel/MachineExcel.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/excel/MachineExcel.java @@ -13,33 +13,35 @@ import java.time.LocalDateTime; */ @Data public class MachineExcel { - @Excel(name = "ID") - private Long id; +// @Excel(name = "ID") +// private Long id; @Excel(name = "机台名") private String name; @Excel(name = "机台编码") private String code; - @Excel(name = "机台id，关联platform id") - private Long platformId; - @Excel(name = "1 可用，0 不可用") - private Integer status; +// @Excel(name = "机台id，关联platform id") +// private Long platformId; + @Excel(name = "站点") + private String platformName; +// @Excel(name = "1 可用，0 不可用") +// private Integer status; @Excel(name = "备注") private String remark; - @Excel(name = "删除标志，是否有效:1 可用 0不可用") - private Integer valid; - @Excel(name = "创建人") - private Long creatorId; - @Excel(name = "创建人姓名") - private String creatorName; - @Excel(name = "创建时间") - private LocalDateTime createTime; - @Excel(name = "更新人") - private Long updaterId; - @Excel(name = "更新人姓名") - private String updaterName; - @Excel(name = "更新时间") - private LocalDateTime updateTime; - @Excel(name = "版本号") - private Integer version; +// @Excel(name = "删除标志，是否有效:1 可用 0不可用") +// private Integer valid; +// @Excel(name = "创建人") +// private Long creatorId; +// @Excel(name = "创建人姓名") +// private String creatorName; +// @Excel(name = "创建时间") +// private LocalDateTime createTime; +// @Excel(name = "更新人") +// private Long updaterId; +// @Excel(name = "更新人姓名") +// private String updaterName; +// @Excel(name = "更新时间") +// private LocalDateTime updateTime; +// @Excel(name = "版本号") +// private Integer version; } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/excel/PlatformExcel.java b/ym-baisc/src/main/java/com/cnbm/basic/excel/PlatformExcel.java index 6414557..66de16c 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/excel/PlatformExcel.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/excel/PlatformExcel.java @@ -13,33 +13,33 @@ import java.time.LocalDateTime; */ @Data public class PlatformExcel { - @Excel(name = "ID") - private Long id; +// @Excel(name = "ID") +// private Long id; @Excel(name = "站台名") private String name; @Excel(name = "站台编码") private String code; @Excel(name = "站台分组") private String platformGroup; - @Excel(name = "1 可用，0 不可用") - private Integer status; - @Excel(name = "备注") - private String remark; - @Excel(name = "删除标志，是否有效:1 可用 0不可用") - private Integer valid; - @Excel(name = "创建人") - private Long creatorId; - @Excel(name = "创建人姓名") - private String creatorName; - @Excel(name = "创建时间") - private LocalDateTime createTime; - @Excel(name = "更新人") - private Long updaterId; - @Excel(name = "更新人姓名") - private String updaterName; - @Excel(name = "更新时间") - private LocalDateTime updateTime; - @Excel(name = "版本号") - private Integer version; +// @Excel(name = "1 可用，0 不可用") +// private Integer status; +// @Excel(name = "备注") +// private String remark; +// @Excel(name = "删除标志，是否有效:1 可用 0不可用") +// private Integer valid; +// @Excel(name = "创建人") +// private Long creatorId; +// @Excel(name = "创建人姓名") +// private String creatorName; +// @Excel(name = "创建时间") +// private LocalDateTime createTime; +// @Excel(name = "更新人") +// private Long updaterId; +// @Excel(name = "更新人姓名") +// private String updaterName; +// @Excel(name = "更新时间") +// private LocalDateTime updateTime; +// @Excel(name = "版本号") +// private Integer version; } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/excel/ProductWorkingprocedureRelationExcel.java b/ym-baisc/src/main/java/com/cnbm/basic/excel/ProductWorkingprocedureRelationExcel.java index c52f7a0..7895780 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/excel/ProductWorkingprocedureRelationExcel.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/excel/ProductWorkingprocedureRelationExcel.java @@ -20,7 +20,7 @@ public class ProductWorkingprocedureRelationExcel { @Excel(name = "工序id,关联 working_procedure 表") private Long workingProcedureId; @Excel(name = "顺序，工序是有先后顺序的。") - private Integer order; + private Integer sequence; @Excel(name = "1 可用，0 不可用") private Integer status; @Excel(name = "备注") diff --git a/ym-baisc/src/main/java/com/cnbm/basic/excel/UnitExcel.java b/ym-baisc/src/main/java/com/cnbm/basic/excel/UnitExcel.java index 5e10f7c..f4015cf 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/excel/UnitExcel.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/excel/UnitExcel.java @@ -13,33 +13,33 @@ import java.time.LocalDateTime; */ @Data public class UnitExcel { - @Excel(name = "ID") - private Long id; +// @Excel(name = "ID") +// private Long id; @Excel(name = "单位 名") private String name; @Excel(name = "单位 编码") private String code; - @Excel(name = "单位类型，1 可计数，2 不可计数") - private Integer type; - @Excel(name = "1 可用，0 不可用") - private Integer status; - @Excel(name = "备注") - private String remark; - @Excel(name = "删除标志，是否有效:1 可用 0不可用") - private Integer valid; - @Excel(name = "创建人") - private Long creatorId; - @Excel(name = "创建人姓名") - private String creatorName; - @Excel(name = "创建时间") - private LocalDateTime createTime; - @Excel(name = "更新人") - private Long updaterId; - @Excel(name = "更新人姓名") - private String updaterName; - @Excel(name = "更新时间") - private LocalDateTime updateTime; - @Excel(name = "版本号") - private Integer version; +// @Excel(name = "单位类型，1 可计数，2 不可计数") +// private Integer type; +// @Excel(name = "1 可用，0 不可用") +// private Integer status; +// @Excel(name = "备注") +// private String remark; +// @Excel(name = "删除标志，是否有效:1 可用 0不可用") +// private Integer valid; +// @Excel(name = "创建人") +// private Long creatorId; +// @Excel(name = "创建人姓名") +// private String creatorName; +// @Excel(name = "创建时间") +// private LocalDateTime createTime; +// @Excel(name = "更新人") +// private Long updaterId; +// @Excel(name = "更新人姓名") +// private String updaterName; +// @Excel(name = "更新时间") +// private LocalDateTime updateTime; +// @Excel(name = "版本号") +// private Integer version; } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/excel/WorkingProcedureTypeExcel.java b/ym-baisc/src/main/java/com/cnbm/basic/excel/WorkingProcedureTypeExcel.java index df64379..0e64f40 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/excel/WorkingProcedureTypeExcel.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/excel/WorkingProcedureTypeExcel.java @@ -13,31 +13,31 @@ import java.time.LocalDateTime; */ @Data public class WorkingProcedureTypeExcel { - @Excel(name = "ID") - private Long id; +// @Excel(name = "ID") +// private Long id; @Excel(name = "工序类型 名") private String name; @Excel(name = "工序类型 编码") private String code; - @Excel(name = "1 可用，0 不可用") - private Integer status; - @Excel(name = "备注") - private String remark; - @Excel(name = "删除标志，是否有效:1 可用 0不可用") - private Integer valid; - @Excel(name = "创建人") - private Long creatorId; - @Excel(name = "创建人姓名") - private String creatorName; - @Excel(name = "创建时间") - private LocalDateTime createTime; - @Excel(name = "更新人") - private Long updaterId; - @Excel(name = "更新人姓名") - private String updaterName; - @Excel(name = "更新时间") - private LocalDateTime updateTime; - @Excel(name = "版本号") - private Integer version; +// @Excel(name = "1 可用，0 不可用") +// private Integer status; +// @Excel(name = "备注") +// private String remark; +// @Excel(name = "删除标志，是否有效:1 可用 0不可用") +// private Integer valid; +// @Excel(name = "创建人") +// private Long creatorId; +// @Excel(name = "创建人姓名") +// private String creatorName; +// @Excel(name = "创建时间") +// private LocalDateTime createTime; +// @Excel(name = "更新人") +// private Long updaterId; +// @Excel(name = "更新人姓名") +// private String updaterName; +// @Excel(name = "更新时间") +// private LocalDateTime updateTime; +// @Excel(name = "版本号") +// private Integer version; } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/mapper/FactoryMapper.java b/ym-baisc/src/main/java/com/cnbm/basic/mapper/FactoryMapper.java index 1b08229..fcc4f6b 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/mapper/FactoryMapper.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/FactoryMapper.java @@ -1,9 +1,12 @@ package com.cnbm.basic.mapper; +import com.cnbm.basic.dto.FactoryDTO; import com.cnbm.common.dao.BaseDao; import com.cnbm.basic.entity.Factory; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 工厂 表 * @@ -12,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface FactoryMapper extends BaseDao { - + + List list(); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/mapper/MachineMapper.java b/ym-baisc/src/main/java/com/cnbm/basic/mapper/MachineMapper.java index 06399d7..9210809 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/mapper/MachineMapper.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/MachineMapper.java @@ -3,13 +3,13 @@ package com.cnbm.basic.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cnbm.basic.dto.MachineDTO; -import com.cnbm.basic.vo.MachineVo; import com.cnbm.common.dao.BaseDao; import com.cnbm.basic.entity.Machine; import com.cnbm.common.page.PageData; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; /** @@ -20,5 +20,7 @@ import java.util.Map; */ @Mapper public interface MachineMapper extends BaseDao { - PageData page(Page page, @Param("param") Map params); + PageData page(Map params); + + List list(Map params); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/mapper/PlatformMapper.java b/ym-baisc/src/main/java/com/cnbm/basic/mapper/PlatformMapper.java index 1a50443..98560d3 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/mapper/PlatformMapper.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/PlatformMapper.java @@ -1,9 +1,13 @@ package com.cnbm.basic.mapper; +import com.cnbm.basic.dto.FactoryDTO; +import com.cnbm.basic.dto.PlatformDTO; import com.cnbm.common.dao.BaseDao; import com.cnbm.basic.entity.Platform; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 站点表 * @@ -12,5 +16,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PlatformMapper extends BaseDao { - + List list(); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java b/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java index c21df63..3f43e75 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java @@ -1,12 +1,14 @@ package com.cnbm.basic.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.cnbm.basic.dto.FactoryDTO; import com.cnbm.basic.dto.ProductTypeDTO; import com.cnbm.common.dao.BaseDao; import com.cnbm.basic.entity.ProductType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; /** @@ -18,4 +20,5 @@ import java.util.Map; @Mapper public interface ProductTypeMapper extends BaseDao { //IPage page(IPage objectPage, @Param("param") Map params); + List list(); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.java b/ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.java index 8c6374e..c0c08dc 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/UnitMapper.java @@ -1,9 +1,13 @@ package com.cnbm.basic.mapper; +import com.cnbm.basic.dto.FactoryDTO; +import com.cnbm.basic.dto.UnitDTO; import com.cnbm.common.dao.BaseDao; import com.cnbm.basic.entity.Unit; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 单位 表 * @@ -12,5 +16,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface UnitMapper extends BaseDao { - + List list(); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/mapper/WorkingProcedureMapper.java b/ym-baisc/src/main/java/com/cnbm/basic/mapper/WorkingProcedureMapper.java index 011cb10..76dcae7 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/mapper/WorkingProcedureMapper.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/mapper/WorkingProcedureMapper.java @@ -6,6 +6,7 @@ import com.cnbm.common.dao.BaseDao; import com.cnbm.basic.entity.WorkingProcedure; import org.apache.ibatis.annotations.Mapper; +import java.util.List; import java.util.Map; /** @@ -16,5 +17,6 @@ import java.util.Map; */ @Mapper public interface WorkingProcedureMapper extends BaseDao { - IPage page(Map params); + //IPage page(Map params); + List list(); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IFactoryService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IFactoryService.java index 774b8ae..1c269e9 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IFactoryService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IFactoryService.java @@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService; import com.cnbm.basic.dto.FactoryDTO; import com.cnbm.basic.entity.Factory; +import java.util.List; import java.util.Map; /** @@ -24,5 +25,7 @@ public interface IFactoryService extends CrudService { void delete(Long[] ids); + List list(); + boolean changeStatus(Long id); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IMachineService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IMachineService.java index 8c90524..a1578cc 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IMachineService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IMachineService.java @@ -1,11 +1,11 @@ package com.cnbm.basic.service; -import com.cnbm.basic.vo.MachineVo; import com.cnbm.common.page.PageData; import com.cnbm.common.service.CrudService; import com.cnbm.basic.dto.MachineDTO; import com.cnbm.basic.entity.Machine; +import java.util.List; import java.util.Map; /** @@ -17,7 +17,7 @@ import java.util.Map; public interface IMachineService extends CrudService { PageData page (Map params); - PageData page1 (Map params); + PageData page1 (Map params); MachineDTO get(Long id); @@ -27,5 +27,7 @@ public interface IMachineService extends CrudService { void delete(Long[] ids); + List list(Map params); + boolean changeStatus(Long id); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IPlatformService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IPlatformService.java index 9d3e18d..2d7e7d0 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IPlatformService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IPlatformService.java @@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService; import com.cnbm.basic.dto.PlatformDTO; import com.cnbm.basic.entity.Platform; +import java.util.List; import java.util.Map; /** @@ -24,5 +25,7 @@ public interface IPlatformService extends CrudService { void delete(Long[] ids); + List list(); + boolean changeStatus(Long id); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java index d162a62..61d6335 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IProductTypeService.java @@ -1,10 +1,12 @@ package com.cnbm.basic.service; +import com.cnbm.basic.dto.FactoryDTO; import com.cnbm.common.page.PageData; import com.cnbm.common.service.CrudService; import com.cnbm.basic.dto.ProductTypeDTO; import com.cnbm.basic.entity.ProductType; +import java.util.List; import java.util.Map; /** @@ -24,5 +26,7 @@ public interface IProductTypeService extends CrudService list(); + boolean changeStatus(Long id); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IUnitService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IUnitService.java index bbdd660..f761eee 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IUnitService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IUnitService.java @@ -1,10 +1,12 @@ package com.cnbm.basic.service; +import com.cnbm.basic.dto.FactoryDTO; 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.List; import java.util.Map; /** @@ -22,5 +24,7 @@ public interface IUnitService extends CrudService { void update(UnitDTO dto); + List list(); + boolean changeStatus(Long id); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureService.java b/ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureService.java index 277f6e8..794dd35 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureService.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/IWorkingProcedureService.java @@ -28,4 +28,6 @@ public interface IWorkingProcedureService extends CrudService getWorkingProcedureByProductId(Long productId); + + List list(); } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/FactoryServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/FactoryServiceImpl.java index 9640924..88db7a0 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/FactoryServiceImpl.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/FactoryServiceImpl.java @@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.cnbm.basic.dto.MachineDTO; import com.cnbm.basic.dto.ProductTypeDTO; import com.cnbm.basic.entity.ProductType; import com.cnbm.common.page.PageData; @@ -13,11 +14,13 @@ 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.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.List; import java.util.Map; /** @@ -28,6 +31,7 @@ import java.util.Map; */ @Service public class FactoryServiceImpl extends CrudServiceImpl implements IFactoryService { +@Autowired private FactoryMapper mapper; @Override public QueryWrapper getWrapper(Map params){ @@ -90,4 +94,11 @@ public class FactoryServiceImpl extends CrudServiceImpl list() { + List list = mapper.list(); + return list; + } + } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java index d1bfe30..dfb21d6 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cnbm.basic.entity.Platform; -import com.cnbm.basic.vo.MachineVo; import com.cnbm.common.page.PageData; import com.cnbm.common.service.impl.CrudServiceImpl; import com.cnbm.basic.dto.MachineDTO; @@ -20,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.Arrays; +import java.util.List; import java.util.Map; /** @@ -59,7 +59,7 @@ public class MachineServiceImpl extends CrudServiceImpl page1 (Map params){ + public PageData page1 (Map params){ // IPage page = baseDao.selectPage( // getPage(params, "id", true), // getWrapper(params) // ); - return mapper.page(new Page<>(Integer.parseInt(params.get("page").toString()), Integer.parseInt(params.get("limit").toString())), - params); + return mapper.page(params); } @@ -118,4 +117,11 @@ public class MachineServiceImpl extends CrudServiceImpl list(Map params) { + List list = mapper.list(params); + return list; + } + } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/PlatformServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/PlatformServiceImpl.java index 596e39f..a4fdf66 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/PlatformServiceImpl.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/PlatformServiceImpl.java @@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.cnbm.basic.dto.FactoryDTO; import com.cnbm.common.page.PageData; import com.cnbm.common.service.impl.CrudServiceImpl; import com.cnbm.basic.dto.PlatformDTO; @@ -11,11 +12,13 @@ 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.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.List; import java.util.Map; /** @@ -26,6 +29,8 @@ import java.util.Map; */ @Service public class PlatformServiceImpl extends CrudServiceImpl implements IPlatformService { +@Autowired +private PlatformMapper mapper; @Override public QueryWrapper getWrapper(Map params){ @@ -82,5 +87,12 @@ public class PlatformServiceImpl extends CrudServiceImpl list() { + List list = mapper.list(); + return list; + } + } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java index e58e7f6..a3e6200 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java @@ -6,6 +6,7 @@ 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.basic.dto.FactoryDTO; import com.cnbm.common.constant.Constant; import com.cnbm.common.page.PageData; import com.cnbm.common.service.impl.CrudServiceImpl; @@ -21,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.Arrays; +import java.util.List; import java.util.Map; /** @@ -32,9 +34,8 @@ import java.util.Map; @Service public class ProductTypeServiceImpl extends CrudServiceImpl implements IProductTypeService { - - //@Autowired - //private ProductTypeMapper productTypeMapper; + @Autowired + private ProductTypeMapper mapper; @Override public QueryWrapper getWrapper(Map params){ @@ -94,4 +95,10 @@ public class ProductTypeServiceImpl extends CrudServiceImpl list() { + List list = mapper.list(); + return list; + } } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java index effff72..8275888 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java @@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.cnbm.basic.dto.FactoryDTO; import com.cnbm.common.page.PageData; import com.cnbm.common.service.impl.CrudServiceImpl; import com.cnbm.basic.dto.UnitDTO; @@ -10,10 +11,12 @@ import com.cnbm.basic.entity.Unit; import com.cnbm.basic.mapper.UnitMapper; import com.cnbm.basic.service.IUnitService; 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.List; import java.util.Map; /** @@ -24,6 +27,8 @@ import java.util.Map; */ @Service public class UnitServiceImpl extends CrudServiceImpl implements IUnitService { + @Autowired + private UnitMapper mapper; @Override public QueryWrapper getWrapper(Map params){ @@ -72,4 +77,12 @@ public class UnitServiceImpl extends CrudServiceImpl entity.setStatus(status); return updateById(entity); } + + @Override + @Transactional(rollbackFor = Exception.class) + public List list() { + List list = mapper.list(); + return list; + } + } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java index 051e59f..63b5d78 100644 --- a/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java +++ b/ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java @@ -3,9 +3,12 @@ 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.UnitDTO; +import com.cnbm.basic.entity.Machine; import com.cnbm.basic.entity.ProductWorkingprocedureRelation; import com.cnbm.basic.entity.WorkingProcedureType; import com.cnbm.basic.mapper.ProductWorkingprocedureRelationMapper; +import com.cnbm.basic.mapper.UnitMapper; import com.cnbm.common.page.PageData; import com.cnbm.common.service.impl.CrudServiceImpl; import com.cnbm.basic.dto.WorkingProcedureDTO; @@ -59,7 +62,7 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl workingProcedureDTOPageData = getPageData(page, WorkingProcedureDTO.class); - if(workingProcedureDTOPageData.getList().isEmpty()){ + if(!workingProcedureDTOPageData.getList().isEmpty()){ for(WorkingProcedureDTO workingProcedureDTO:workingProcedureDTOPageData.getList()){ //工序类型 id,关联working_procedure_type表 WorkingProcedureType workingProcedureType = workingProcedureTypeServiceImpl.selectById(workingProcedureDTO.getWorkingProcedureTypeId()); @@ -77,9 +80,10 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl machineQueryWrapper = new QueryWrapper<>(); //machineQueryWrapper.eq(StringUtils.isNotBlank(machineId), "id", machineId); - String machineName = machineServiceImpl.selectById(machineId).getName(); - if(machineName!=null) { - machineList.add(machineName); + //String machineName = null; + Machine machine = machineServiceImpl.selectById(machineId); + if(machine!=null&&machine.getName()!=null) { + machineList.add(machine.getName()); } } String machineNameList = String.join(",", machineList); @@ -145,4 +149,15 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl list() { + List list = workingProcedureMapper.list(); + return list; + } + } \ No newline at end of file diff --git a/ym-baisc/src/main/java/com/cnbm/basic/vo/MachineVo.java b/ym-baisc/src/main/java/com/cnbm/basic/vo/MachineVo.java deleted file mode 100644 index b65b1ac..0000000 --- a/ym-baisc/src/main/java/com/cnbm/basic/vo/MachineVo.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.cnbm.basic.vo; - -import com.cnbm.basic.dto.MachineDTO; -import com.cnbm.common.page.PageData; -import com.cnbm.common.vo.CommonVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -/** - * 机台表 - * - * @author yanyang - * @since 2022-08-02 - */ - -@Data -@ApiModel(value = "机台表DTO对象") -public class MachineVo extends MachineDTO { -// private static final long serialVersionUID = 1L; - - -// @ApiModelProperty(value = "ID") -// private Long id; -// -// @ApiModelProperty(value = "机台名") -// private String name; -// -// @ApiModelProperty(value = "机台编码") -// private String code; -// -// @ApiModelProperty(value = "机台id，关联platform id") -// private Long platformId; - - @ApiModelProperty(value = "机台名称，关联platform id") - private String platformName; - -// @ApiModelProperty(value = "1 可用，0 不可用") -// private Integer status; -// -// @ApiModelProperty(value = "备注") -// private String remark; - -} \ No newline at end of file diff --git a/ym-baisc/src/main/resources/FactoryMapper.xml b/ym-baisc/src/main/resources/mapper/FactoryMapper.xml similarity index 61% rename from ym-baisc/src/main/resources/FactoryMapper.xml rename to ym-baisc/src/main/resources/mapper/FactoryMapper.xml index d1c9b9b..52e32a0 100644 --- a/ym-baisc/src/main/resources/FactoryMapper.xml +++ b/ym-baisc/src/main/resources/mapper/FactoryMapper.xml @@ -2,4 +2,9 @@ + + diff --git a/ym-baisc/src/main/resources/MachineMapper.xml b/ym-baisc/src/main/resources/mapper/MachineMapper.xml similarity index 69% rename from ym-baisc/src/main/resources/MachineMapper.xml rename to ym-baisc/src/main/resources/mapper/MachineMapper.xml index ede195d..0aad2d9 100644 --- a/ym-baisc/src/main/resources/MachineMapper.xml +++ b/ym-baisc/src/main/resources/mapper/MachineMapper.xml @@ -10,6 +10,7 @@ + + + diff --git a/ym-baisc/src/main/resources/MeasureToolMapper.xml b/ym-baisc/src/main/resources/mapper/MeasureToolMapper.xml similarity index 100% rename from ym-baisc/src/main/resources/MeasureToolMapper.xml rename to ym-baisc/src/main/resources/mapper/MeasureToolMapper.xml diff --git a/ym-baisc/src/main/resources/PlatformMapper.xml b/ym-baisc/src/main/resources/mapper/PlatformMapper.xml similarity index 61% rename from ym-baisc/src/main/resources/PlatformMapper.xml rename to ym-baisc/src/main/resources/mapper/PlatformMapper.xml index 9d5bb19..dce3976 100644 --- a/ym-baisc/src/main/resources/PlatformMapper.xml +++ b/ym-baisc/src/main/resources/mapper/PlatformMapper.xml @@ -2,4 +2,9 @@ + + diff --git a/ym-baisc/src/main/resources/ProductFactoryRelationMapper.xml b/ym-baisc/src/main/resources/mapper/ProductFactoryRelationMapper.xml similarity index 100% rename from ym-baisc/src/main/resources/ProductFactoryRelationMapper.xml rename to ym-baisc/src/main/resources/mapper/ProductFactoryRelationMapper.xml diff --git a/ym-baisc/src/main/resources/ProductFeaturesHisMapper.xml b/ym-baisc/src/main/resources/mapper/ProductFeaturesHisMapper.xml similarity index 100% rename from ym-baisc/src/main/resources/ProductFeaturesHisMapper.xml rename to ym-baisc/src/main/resources/mapper/ProductFeaturesHisMapper.xml diff --git a/ym-baisc/src/main/resources/ProductFeaturesMapper.xml b/ym-baisc/src/main/resources/mapper/ProductFeaturesMapper.xml similarity index 100% rename from ym-baisc/src/main/resources/ProductFeaturesMapper.xml rename to ym-baisc/src/main/resources/mapper/ProductFeaturesMapper.xml diff --git a/ym-baisc/src/main/resources/ProductMapper.xml b/ym-baisc/src/main/resources/mapper/ProductMapper.xml similarity index 100% rename from ym-baisc/src/main/resources/ProductMapper.xml rename to ym-baisc/src/main/resources/mapper/ProductMapper.xml diff --git a/ym-baisc/src/main/resources/ProductTypeMapper.xml b/ym-baisc/src/main/resources/mapper/ProductTypeMapper.xml similarity index 60% rename from ym-baisc/src/main/resources/ProductTypeMapper.xml rename to ym-baisc/src/main/resources/mapper/ProductTypeMapper.xml index 9dfb63c..0de8c03 100644 --- a/ym-baisc/src/main/resources/ProductTypeMapper.xml +++ b/ym-baisc/src/main/resources/mapper/ProductTypeMapper.xml @@ -2,4 +2,9 @@ + + diff --git a/ym-baisc/src/main/resources/ProductWorkingprocedureRelationMapper.xml b/ym-baisc/src/main/resources/mapper/ProductWorkingprocedureRelationMapper.xml similarity index 100% rename from ym-baisc/src/main/resources/ProductWorkingprocedureRelationMapper.xml rename to ym-baisc/src/main/resources/mapper/ProductWorkingprocedureRelationMapper.xml diff --git a/ym-baisc/src/main/resources/ShiftMapper.xml b/ym-baisc/src/main/resources/mapper/ShiftMapper.xml similarity index 100% rename from ym-baisc/src/main/resources/ShiftMapper.xml rename to ym-baisc/src/main/resources/mapper/ShiftMapper.xml diff --git a/ym-baisc/src/main/resources/TeamMapper.xml b/ym-baisc/src/main/resources/mapper/TeamMapper.xml similarity index 100% rename from ym-baisc/src/main/resources/TeamMapper.xml rename to ym-baisc/src/main/resources/mapper/TeamMapper.xml diff --git a/ym-baisc/src/main/resources/UnitMapper.xml b/ym-baisc/src/main/resources/mapper/UnitMapper.xml similarity index 62% rename from ym-baisc/src/main/resources/UnitMapper.xml rename to ym-baisc/src/main/resources/mapper/UnitMapper.xml index b3d1a3b..e526d9d 100644 --- a/ym-baisc/src/main/resources/UnitMapper.xml +++ b/ym-baisc/src/main/resources/mapper/UnitMapper.xml @@ -2,4 +2,9 @@ + + diff --git a/ym-baisc/src/main/resources/WorkingProcedureMapper.xml b/ym-baisc/src/main/resources/mapper/WorkingProcedureMapper.xml similarity index 59% rename from ym-baisc/src/main/resources/WorkingProcedureMapper.xml rename to ym-baisc/src/main/resources/mapper/WorkingProcedureMapper.xml index 4b6f94e..306b194 100644 --- a/ym-baisc/src/main/resources/WorkingProcedureMapper.xml +++ b/ym-baisc/src/main/resources/mapper/WorkingProcedureMapper.xml @@ -2,4 +2,9 @@ + +