From 366602291064201a8a51541d5bde2aa063829f7a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 17 Feb 2026 14:38:26 +0800 Subject: [PATCH] feat（mes）：新增 defect 缺陷类型 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/MesQcDefectController.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectPageReqVO.java | 27 +++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectRespVO.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectSaveReqVO.java | 45 +++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcDefectDO.java | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcDefectMapper.java | 42 ++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectService.java | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectServiceImpl.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 547 insertions(+), 0 deletions(-) create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/MesQcDefectController.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectPageReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectRespVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectSaveReqVO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcDefectDO.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcDefectMapper.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectService.java create mode 100644 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectServiceImpl.java diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/MesQcDefectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/MesQcDefectController.java new file mode 100644 index 0000000..20fc46d --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/MesQcDefectController.java @@ -0,0 +1,100 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcDefectDO; +import cn.iocoder.yudao.module.mes.service.qc.MesQcDefectService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.util.List; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - MES 缺陷类型") +@RestController +@RequestMapping("/mes/qc/defect") +@Validated +public class MesQcDefectController { + + @Resource + private MesQcDefectService defectService; + + @PostMapping("/create") + @Operation(summary = "创建缺陷类型") + @PreAuthorize("@ss.hasPermission('mes:qc-defect:create')") + public CommonResult createDefect(@Valid @RequestBody MesQcDefectSaveReqVO createReqVO) { + return success(defectService.createDefect(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新缺陷类型") + @PreAuthorize("@ss.hasPermission('mes:qc-defect:update')") + public CommonResult updateDefect(@Valid @RequestBody MesQcDefectSaveReqVO updateReqVO) { + defectService.updateDefect(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除缺陷类型") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:qc-defect:delete')") + public CommonResult deleteDefect(@RequestParam("id") Long id) { + defectService.deleteDefect(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得缺陷类型") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:qc-defect:query')") + public CommonResult getDefect(@RequestParam("id") Long id) { + MesQcDefectDO defect = defectService.getDefect(id); + return success(BeanUtils.toBean(defect, MesQcDefectRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得缺陷类型分页") + @PreAuthorize("@ss.hasPermission('mes:qc-defect:query')") + public CommonResult> getDefectPage(@Valid MesQcDefectPageReqVO pageReqVO) { + PageResult pageResult = defectService.getDefectPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MesQcDefectRespVO.class)); + } + + @GetMapping("/simple-list") + @Operation(summary = "获得缺陷类型精简列表", description = "主要用于前端的下拉选项") + public CommonResult> getDefectSimpleList() { + List list = defectService.getDefectList(); + return success(BeanUtils.toBean(list, MesQcDefectRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出缺陷类型 Excel") + @PreAuthorize("@ss.hasPermission('mes:qc-defect:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportDefectExcel(@Valid MesQcDefectPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = defectService.getDefectPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "缺陷类型.xls", "数据", MesQcDefectRespVO.class, + BeanUtils.toBean(list, MesQcDefectRespVO.class)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectPageReqVO.java new file mode 100644 index 0000000..5605b14 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectPageReqVO.java @@ -0,0 +1,27 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.vo; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Schema(description = "管理后台 - MES 缺陷类型分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesQcDefectPageReqVO extends PageParam { + + @Schema(description = "缺陷编码", example = "DF001") + private String code; + + @Schema(description = "缺陷描述", example = "外观缺陷") + private String name; + + @Schema(description = "检测项类型", example = "APPEARANCE") + private String type; + + @Schema(description = "缺陷等级", example = "MIN") + private String level; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectRespVO.java new file mode 100644 index 0000000..6faa701 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectRespVO.java @@ -0,0 +1,60 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.vo; + +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import cn.iocoder.yudao.module.mes.enums.DictTypeConstants; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 缺陷类型 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MesQcDefectRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "缺陷编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "DF001") + @ExcelProperty("缺陷编码") + private String code; + + @Schema(description = "缺陷描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "外观缺陷") + @ExcelProperty("缺陷描述") + private String name; + + @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "APPEARANCE") + @ExcelProperty(value = "检测项类型", converter = DictConvert.class) + @DictFormat(DictTypeConstants.MES_INDEX_TYPE) + private String type; + + @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "MIN") + @ExcelProperty(value = "缺陷等级", converter = DictConvert.class) + @DictFormat(DictTypeConstants.MES_DEFECT_LEVEL) + private String level; + + @Schema(description = "备注", example = "备注") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectSaveReqVO.java new file mode 100644 index 0000000..2d56b34 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/vo/MesQcDefectSaveReqVO.java @@ -0,0 +1,45 @@ +package cn.iocoder.yudao.module.mes.controller.admin.qc.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +@Schema(description = "管理后台 - MES 缺陷类型新增/修改 Request VO") +@Data +public class MesQcDefectSaveReqVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "缺陷编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "DF001") + @NotEmpty(message = "缺陷编码不能为空") + private String code; + + @Schema(description = "缺陷描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "外观缺陷") + @NotEmpty(message = "缺陷描述不能为空") + private String name; + + @Schema(description = "检测项类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "APPEARANCE") + @NotEmpty(message = "检测项类型不能为空") + private String type; + + @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "MIN") + @NotEmpty(message = "缺陷等级不能为空") + private String level; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "预留字段1") + private String attribute1; + + @Schema(description = "预留字段2") + private String attribute2; + + @Schema(description = "预留字段3") + private Integer attribute3; + + @Schema(description = "预留字段4") + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcDefectDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcDefectDO.java new file mode 100644 index 0000000..0f3f45c --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/MesQcDefectDO.java @@ -0,0 +1,70 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.qc; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +/** + * MES 缺陷类型 DO + * + * @author 芋道源码 + */ +@TableName("mes_qc_defect") +@KeySequence("mes_qc_defect_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesQcDefectDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 缺陷编码 + */ + private String code; + /** + * 缺陷描述 + */ + private String name; + /** + * 检测项类型 + * + * 字典类型 mes_index_type + */ + private String type; + /** + * 缺陷等级 + * + * 字典类型 mes_defect_level + */ + private String level; + /** + * 备注 + */ + private String remark; + /** + * 预留字段1 + */ + private String attribute1; + /** + * 预留字段2 + */ + private String attribute2; + /** + * 预留字段3 + */ + private Integer attribute3; + /** + * 预留字段4 + */ + private Integer attribute4; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcDefectMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcDefectMapper.java new file mode 100644 index 0000000..6ff07a3 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/MesQcDefectMapper.java @@ -0,0 +1,42 @@ +package cn.iocoder.yudao.module.mes.dal.mysql.qc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectPageReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcDefectDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * MES 缺陷类型 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface MesQcDefectMapper extends BaseMapperX { + + default PageResult selectPage(MesQcDefectPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(MesQcDefectDO::getCode, reqVO.getCode()) + .likeIfPresent(MesQcDefectDO::getName, reqVO.getName()) + .eqIfPresent(MesQcDefectDO::getType, reqVO.getType()) + .eqIfPresent(MesQcDefectDO::getLevel, reqVO.getLevel()) + .orderByDesc(MesQcDefectDO::getId)); + } + + default MesQcDefectDO selectByCode(String code) { + return selectOne(MesQcDefectDO::getCode, code); + } + + default MesQcDefectDO selectByName(String name) { + return selectOne(MesQcDefectDO::getName, name); + } + + default List selectList() { + return selectList(new LambdaQueryWrapperX() + .orderByDesc(MesQcDefectDO::getId)); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectService.java new file mode 100644 index 0000000..25630a4 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectService.java @@ -0,0 +1,85 @@ +package cn.iocoder.yudao.module.mes.service.qc; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcDefectDO; +import jakarta.validation.Valid; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; + +/** + * MES 缺陷类型 Service 接口 + * + * @author 芋道源码 + */ +public interface MesQcDefectService { + + /** + * 创建缺陷类型 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createDefect(@Valid MesQcDefectSaveReqVO createReqVO); + + /** + * 更新缺陷类型 + * + * @param updateReqVO 更新信息 + */ + void updateDefect(@Valid MesQcDefectSaveReqVO updateReqVO); + + /** + * 删除缺陷类型 + * + * @param id 编号 + */ + void deleteDefect(Long id); + + /** + * 获得缺陷类型 + * + * @param id 编号 + * @return 缺陷类型 + */ + MesQcDefectDO getDefect(Long id); + + /** + * 获得缺陷类型分页 + * + * @param pageReqVO 分页查询 + * @return 缺陷类型分页 + */ + PageResult getDefectPage(MesQcDefectPageReqVO pageReqVO); + + /** + * 获得缺陷类型列表 + * + * @return 缺陷类型列表 + */ + List getDefectList(); + + /** + * 获得缺陷类型列表 + * + * @param ids 编号数组 + * @return 缺陷类型列表 + */ + List getDefectList(Collection ids); + + /** + * 获得缺陷类型 Map + * + * @param ids 编号数组 + * @return 缺陷类型 Map + */ + default Map getDefectMap(Collection ids) { + return convertMap(getDefectList(ids), MesQcDefectDO::getId); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectServiceImpl.java new file mode 100644 index 0000000..7c427f2 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/MesQcDefectServiceImpl.java @@ -0,0 +1,118 @@ +package cn.iocoder.yudao.module.mes.service.qc; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjUtil; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcDefectSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.qc.MesQcDefectDO; +import cn.iocoder.yudao.module.mes.dal.mysql.qc.MesQcDefectMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; + +/** + * MES 缺陷类型 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class MesQcDefectServiceImpl implements MesQcDefectService { + + @Resource + private MesQcDefectMapper defectMapper; + + @Override + public Long createDefect(MesQcDefectSaveReqVO createReqVO) { + // 校验编码唯一 + validateDefectCodeUnique(null, createReqVO.getCode()); + // 校验名称唯一 + validateDefectNameUnique(null, createReqVO.getName()); + + // 插入 + MesQcDefectDO defect = BeanUtils.toBean(createReqVO, MesQcDefectDO.class); + defectMapper.insert(defect); + return defect.getId(); + } + + @Override + public void updateDefect(MesQcDefectSaveReqVO updateReqVO) { + // 校验存在 + validateDefectExists(updateReqVO.getId()); + // 校验编码唯一 + validateDefectCodeUnique(updateReqVO.getId(), updateReqVO.getCode()); + // 校验名称唯一 + validateDefectNameUnique(updateReqVO.getId(), updateReqVO.getName()); + + // 更新 + MesQcDefectDO updateObj = BeanUtils.toBean(updateReqVO, MesQcDefectDO.class); + defectMapper.updateById(updateObj); + } + + @Override + public void deleteDefect(Long id) { + // 校验存在 + validateDefectExists(id); + // 删除 + defectMapper.deleteById(id); + } + + private void validateDefectExists(Long id) { + if (defectMapper.selectById(id) == null) { + throw exception(QC_DEFECT_NOT_EXISTS); + } + } + + private void validateDefectCodeUnique(Long id, String code) { + MesQcDefectDO defect = defectMapper.selectByCode(code); + if (defect == null) { + return; + } + if (ObjUtil.notEqual(defect.getId(), id)) { + throw exception(QC_DEFECT_CODE_DUPLICATE); + } + } + + private void validateDefectNameUnique(Long id, String name) { + MesQcDefectDO defect = defectMapper.selectByName(name); + if (defect == null) { + return; + } + if (ObjUtil.notEqual(defect.getId(), id)) { + throw exception(QC_DEFECT_NAME_DUPLICATE); + } + } + + @Override + public MesQcDefectDO getDefect(Long id) { + return defectMapper.selectById(id); + } + + @Override + public PageResult getDefectPage(MesQcDefectPageReqVO pageReqVO) { + return defectMapper.selectPage(pageReqVO); + } + + @Override + public List getDefectList() { + return defectMapper.selectList(); + } + + @Override + public List getDefectList(Collection ids) { + if (CollUtil.isEmpty(ids)) { + return Collections.emptyList(); + } + return defectMapper.selectByIds(ids); + } + +} -- libgit2 0.21.4