diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java new file mode 100644 index 0000000..6518380 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonConfigController.java @@ -0,0 +1,110 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.andon; + +import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.collection.MapUtils; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.config.MesProAndonConfigPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.config.MesProAndonConfigRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.config.MesProAndonConfigSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.andon.MesProAndonConfigDO; +import cn.iocoder.yudao.module.mes.service.pro.andon.MesProAndonConfigService; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +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.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; + +@Tag(name = "管理后台 - MES 安灯呼叫配置") +@RestController +@RequestMapping("/mes/pro/andon-config") +@Validated +public class MesProAndonConfigController { + + @Resource + private MesProAndonConfigService andonConfigService; + + @Resource + private AdminUserApi adminUserApi; + + @PostMapping("/create") + @Operation(summary = "创建安灯呼叫配置") + @PreAuthorize("@ss.hasPermission('mes:pro-andon-config:create')") + public CommonResult createAndonConfig(@Valid @RequestBody MesProAndonConfigSaveReqVO createReqVO) { + return success(andonConfigService.createAndonConfig(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新安灯呼叫配置") + @PreAuthorize("@ss.hasPermission('mes:pro-andon-config:update')") + public CommonResult updateAndonConfig(@Valid @RequestBody MesProAndonConfigSaveReqVO updateReqVO) { + andonConfigService.updateAndonConfig(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除安灯呼叫配置") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:pro-andon-config:delete')") + public CommonResult deleteAndonConfig(@RequestParam("id") Long id) { + andonConfigService.deleteAndonConfig(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得安灯呼叫配置") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:pro-andon-config:query')") + public CommonResult getAndonConfig(@RequestParam("id") Long id) { + MesProAndonConfigDO config = andonConfigService.getAndonConfig(id); + if (config == null) { + return success(null); + } + return success(buildConfigRespVOList(List.of(config)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得安灯呼叫配置分页") + @PreAuthorize("@ss.hasPermission('mes:pro-andon-config:query')") + public CommonResult> getAndonConfigPage(@Valid MesProAndonConfigPageReqVO pageReqVO) { + PageResult pageResult = andonConfigService.getAndonConfigPage(pageReqVO); + return success(new PageResult<>(buildConfigRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/list") + @Operation(summary = "获得安灯呼叫配置列表") + @PreAuthorize("@ss.hasPermission('mes:pro-andon-config:query')") + public CommonResult> getAndonConfigList() { + List list = andonConfigService.getAndonConfigList(); + return success(buildConfigRespVOList(list)); + } + + // ==================== 拼接 VO ==================== + + private List buildConfigRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 批量获取关联数据 + Map userMap = adminUserApi.getUserMap( + convertSet(list, MesProAndonConfigDO::getHandlerUserId)); + // 2. 拼接 VO + return BeanUtils.toBean(list, MesProAndonConfigRespVO.class, vo -> + MapUtils.findAndThen(userMap, vo.getHandlerUserId(), + user -> vo.setHandlerUserNickname(user.getNickname()))); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonRecordController.java new file mode 100644 index 0000000..c7465d4 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/MesProAndonRecordController.java @@ -0,0 +1,154 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.andon; + +import cn.hutool.core.collection.CollUtil; +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.collection.MapUtils; +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.pro.andon.vo.record.MesProAndonRecordHandleReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.record.MesProAndonRecordPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.record.MesProAndonRecordRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.record.MesProAndonRecordSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.andon.MesProAndonRecordDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; +import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService; +import cn.iocoder.yudao.module.mes.service.pro.andon.MesProAndonRecordService; +import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService; +import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +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.*; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; + +@Tag(name = "管理后台 - MES 安灯呼叫记录") +@RestController +@RequestMapping("/mes/pro/andon-record") +@Validated +public class MesProAndonRecordController { + + @Resource + private MesProAndonRecordService andonRecordService; + + @Resource + private MesMdWorkstationService workstationService; + + @Resource + private MesProWorkOrderService workOrderService; + + @Resource + private MesProProcessService processService; + + @Resource + private AdminUserApi adminUserApi; + + @PostMapping("/create") + @Operation(summary = "创建安灯呼叫记录") + @PreAuthorize("@ss.hasPermission('mes:pro-andon-record:create')") + public CommonResult createAndonRecord(@Valid @RequestBody MesProAndonRecordSaveReqVO createReqVO) { + return success(andonRecordService.createAndonRecord(createReqVO)); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除安灯呼叫记录") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('mes:pro-andon-record:delete')") + public CommonResult deleteAndonRecord(@RequestParam("id") Long id) { + andonRecordService.deleteAndonRecord(id); + return success(true); + } + + @PutMapping("/handle") + @Operation(summary = "处置安灯呼叫记录") + @PreAuthorize("@ss.hasPermission('mes:pro-andon-record:update')") + public CommonResult handleAndonRecord(@Valid @RequestBody MesProAndonRecordHandleReqVO handleReqVO) { + andonRecordService.handleAndonRecord(handleReqVO); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得安灯呼叫记录") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('mes:pro-andon-record:query')") + public CommonResult getAndonRecord(@RequestParam("id") Long id) { + MesProAndonRecordDO record = andonRecordService.getAndonRecord(id); + if (record == null) { + return success(null); + } + return success(buildRecordRespVOList(List.of(record)).get(0)); + } + + @GetMapping("/page") + @Operation(summary = "获得安灯呼叫记录分页") + @PreAuthorize("@ss.hasPermission('mes:pro-andon-record:query')") + public CommonResult> getAndonRecordPage(@Valid MesProAndonRecordPageReqVO pageReqVO) { + PageResult pageResult = andonRecordService.getAndonRecordPage(pageReqVO); + return success(new PageResult<>(buildRecordRespVOList(pageResult.getList()), pageResult.getTotal())); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出安灯呼叫记录 Excel") + @PreAuthorize("@ss.hasPermission('mes:pro-andon-record:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportAndonRecordExcel(@Valid MesProAndonRecordPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = andonRecordService.getAndonRecordPage(pageReqVO).getList(); + List voList = buildRecordRespVOList(list); + ExcelUtils.write(response, "安灯呼叫记录.xls", "数据", MesProAndonRecordRespVO.class, voList); + } + + // ==================== 拼接 VO ==================== + + private List buildRecordRespVOList(List list) { + if (CollUtil.isEmpty(list)) { + return Collections.emptyList(); + } + // 1. 批量获取关联数据 + Map workstationMap = workstationService.getWorkstationMap( + convertSet(list, MesProAndonRecordDO::getWorkstationId)); + Map workOrderMap = workOrderService.getWorkOrderMap( + convertSet(list, MesProAndonRecordDO::getWorkOrderId)); + Map processMap = processService.getProcessMap( + new ArrayList<>(convertSet(list, MesProAndonRecordDO::getProcessId))); + // 收集所有用户 ID(发起人 + 处置人) + // TODO @AI:可以使用 collutils 里,convert 去收集多个字段的 id; + Set userIds = new HashSet<>(); + userIds.addAll(convertSet(list, MesProAndonRecordDO::getUserId)); + userIds.addAll(convertSet(list, MesProAndonRecordDO::getHandlerUserId)); + userIds.remove(null); + Map userMap = adminUserApi.getUserMap(userIds); + // 2. 拼接 VO + return BeanUtils.toBean(list, MesProAndonRecordRespVO.class, vo -> { + MapUtils.findAndThen(workstationMap, vo.getWorkstationId(), ws -> + vo.setWorkstationCode(ws.getCode()).setWorkstationName(ws.getName())); + MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), + wo -> vo.setWorkOrderCode(wo.getCode())); + MapUtils.findAndThen(processMap, vo.getProcessId(), + process -> vo.setProcessName(process.getName())); + MapUtils.findAndThen(userMap, vo.getUserId(), + user -> vo.setUserNickname(user.getNickname())); + MapUtils.findAndThen(userMap, vo.getHandlerUserId(), + user -> vo.setHandlerUserNickname(user.getNickname())); + }); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/config/MesProAndonConfigPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/config/MesProAndonConfigPageReqVO.java new file mode 100644 index 0000000..d2ca9f6 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/config/MesProAndonConfigPageReqVO.java @@ -0,0 +1,21 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.config; + +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 MesProAndonConfigPageReqVO extends PageParam { + + @Schema(description = "呼叫原因", example = "设备故障") + private String reason; + + @Schema(description = "级别", example = "1") + private Integer level; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/config/MesProAndonConfigRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/config/MesProAndonConfigRespVO.java new file mode 100644 index 0000000..ed1e541 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/config/MesProAndonConfigRespVO.java @@ -0,0 +1,36 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.config; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 安灯呼叫配置 Response VO") +@Data +public class MesProAndonConfigRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "呼叫原因", example = "设备故障") + private String reason; + + @Schema(description = "级别", example = "1") + private Integer level; + + @Schema(description = "处置人角色编号", example = "10") + private Long handlerRoleId; + + @Schema(description = "处置人编号", example = "100") + private Long handlerUserId; + + @Schema(description = "处置人昵称", example = "张三") + private String handlerUserNickname; + + @Schema(description = "备注", example = "备注") + private String remark; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/config/MesProAndonConfigSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/config/MesProAndonConfigSaveReqVO.java new file mode 100644 index 0000000..7ac3397 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/config/MesProAndonConfigSaveReqVO.java @@ -0,0 +1,32 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.config; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "管理后台 - MES 安灯呼叫配置新增/修改 Request VO") +@Data +public class MesProAndonConfigSaveReqVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + private Long id; + + @Schema(description = "呼叫原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "设备故障") + @NotEmpty(message = "呼叫原因不能为空") + private String reason; + + @Schema(description = "级别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "级别不能为空") + private Integer level; + + @Schema(description = "处置人角色编号", example = "10") + private Long handlerRoleId; + + @Schema(description = "处置人编号", example = "100") + private Long handlerUserId; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/record/MesProAndonRecordHandleReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/record/MesProAndonRecordHandleReqVO.java new file mode 100644 index 0000000..8f326ed --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/record/MesProAndonRecordHandleReqVO.java @@ -0,0 +1,28 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.record; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 安灯呼叫记录处置 Request VO") +@Data +public class MesProAndonRecordHandleReqVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @NotNull(message = "编号不能为空") + private Long id; + + @Schema(description = "处置时间", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "处置时间不能为空") + private LocalDateTime handleTime; + + @Schema(description = "处置人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "处置人不能为空") + private Long handlerUserId; + + @Schema(description = "备注", example = "已修复") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/record/MesProAndonRecordPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/record/MesProAndonRecordPageReqVO.java new file mode 100644 index 0000000..ea3d752 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/record/MesProAndonRecordPageReqVO.java @@ -0,0 +1,33 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.record; + +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; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - MES 安灯呼叫记录分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MesProAndonRecordPageReqVO extends PageParam { + + @Schema(description = "工作站编号", example = "100") + private Long workstationId; + + @Schema(description = "级别", example = "1") + private Integer level; + + @Schema(description = "处置状态", example = "0") + private Integer status; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/record/MesProAndonRecordRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/record/MesProAndonRecordRespVO.java new file mode 100644 index 0000000..50e8e53 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/record/MesProAndonRecordRespVO.java @@ -0,0 +1,87 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.record; + +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 MesProAndonRecordRespVO { + + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @ExcelProperty("编号") + private Long id; + + @Schema(description = "工作站编号", example = "100") + private Long workstationId; + + @Schema(description = "工作站编码", example = "WS-001") + @ExcelProperty("工作站编码") + private String workstationCode; + + @Schema(description = "工作站名称", example = "工作站 A") + @ExcelProperty("工作站名称") + private String workstationName; + + @Schema(description = "发起用户编号", example = "1") + private Long userId; + + @Schema(description = "发起人昵称", example = "张三") + @ExcelProperty("发起人") + private String userNickname; + + @Schema(description = "生产工单编号", example = "200") + private Long workOrderId; + + @Schema(description = "工单编码", example = "WO-001") + @ExcelProperty("工单编码") + private String workOrderCode; + + @Schema(description = "工序编号", example = "300") + private Long processId; + + @Schema(description = "工序名称", example = "组装工序") + @ExcelProperty("工序名称") + private String processName; + + @Schema(description = "呼叫原因", example = "设备故障") + @ExcelProperty("呼叫原因") + private String reason; + + @Schema(description = "级别", example = "1") + @ExcelProperty(value = "级别", converter = DictConvert.class) + @DictFormat(DictTypeConstants.MES_PRO_ANDON_LEVEL) + private Integer level; + + @Schema(description = "处置状态", example = "0") + @ExcelProperty(value = "处置状态", converter = DictConvert.class) + @DictFormat(DictTypeConstants.MES_PRO_ANDON_STATUS) + private Integer status; + + @Schema(description = "处置时间") + @ExcelProperty("处置时间") + private LocalDateTime handleTime; + + @Schema(description = "处置人编号", example = "100") + private Long handlerUserId; + + @Schema(description = "处置人昵称", example = "李四") + @ExcelProperty("处置人") + private String handlerUserNickname; + + @Schema(description = "备注", example = "备注") + @ExcelProperty("备注") + private String remark; + + @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/pro/andon/vo/record/MesProAndonRecordSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/record/MesProAndonRecordSaveReqVO.java new file mode 100644 index 0000000..9d82763 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/andon/vo/record/MesProAndonRecordSaveReqVO.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.record; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "管理后台 - MES 安灯呼叫记录新增 Request VO") +@Data +public class MesProAndonRecordSaveReqVO { + + @Schema(description = "工作站编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") + @NotNull(message = "工作站不能为空") + private Long workstationId; + + @Schema(description = "发起用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "发起用户不能为空") + private Long userId; + + @Schema(description = "生产工单编号", example = "200") + private Long workOrderId; + + @Schema(description = "工序编号", example = "300") + private Long processId; + + @Schema(description = "呼叫原因", requiredMode = Schema.RequiredMode.REQUIRED, example = "设备故障") + @NotEmpty(message = "呼叫原因不能为空") + private String reason; + + @Schema(description = "级别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "级别不能为空") + private Integer level; + + @Schema(description = "备注", example = "备注") + private String remark; + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/andon/MesProAndonConfigDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/andon/MesProAndonConfigDO.java new file mode 100644 index 0000000..c9f26b4 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/andon/MesProAndonConfigDO.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.pro.andon; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.enums.pro.MesProAndonLevelEnum; +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_pro_andon_config") +@KeySequence("mes_pro_andon_config_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesProAndonConfigDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 呼叫原因 + */ + private String reason; + /** + * 级别 + * + * 枚举 {@link MesProAndonLevelEnum} + */ + private Integer level; + /** + * 处置人角色编号 + * + * 关联 system_role#id + */ + private Long handlerRoleId; + /** + * 处置人编号 + * + * 关联 system_users#id + */ + private Long handlerUserId; + /** + * 备注 + */ + 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/dataobject/pro/andon/MesProAndonRecordDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/andon/MesProAndonRecordDO.java new file mode 100644 index 0000000..047071b --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/andon/MesProAndonRecordDO.java @@ -0,0 +1,107 @@ +package cn.iocoder.yudao.module.mes.dal.dataobject.pro.andon; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO; +import cn.iocoder.yudao.module.mes.enums.pro.MesProAndonLevelEnum; +import cn.iocoder.yudao.module.mes.enums.pro.MesProAndonStatusEnum; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.time.LocalDateTime; + +/** + * MES 安灯呼叫记录 DO + * + * @author 芋道源码 + */ +@TableName("mes_pro_andon_record") +@KeySequence("mes_pro_andon_record_seq") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MesProAndonRecordDO extends BaseDO { + + /** + * 编号 + */ + @TableId + private Long id; + /** + * 工作站编号 + * + * 关联 {@link MesMdWorkstationDO#getId()} + */ + private Long workstationId; + /** + * 发起用户编号 + * + * 关联 system_users#id + */ + private Long userId; + /** + * 生产工单编号 + * + * 关联 {@link MesProWorkOrderDO#getId()} + */ + private Long workOrderId; + /** + * 工序编号 + * + * 关联 {@link MesProProcessDO#getId()} + */ + private Long processId; + /** + * 呼叫原因(快照值,不随配置变更) + */ + private String reason; + /** + * 级别(快照值) + * + * 枚举 {@link MesProAndonLevelEnum} + */ + private Integer level; + /** + * 处置状态 + * + * 枚举 {@link MesProAndonStatusEnum} + */ + private Integer status; + /** + * 处置时间 + */ + private LocalDateTime handleTime; + /** + * 处置人编号 + * + * 关联 system_users#id + */ + private Long handlerUserId; + /** + * 备注 + */ + 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/enums/pro/MesProAndonLevelEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProAndonLevelEnum.java new file mode 100644 index 0000000..d12c861 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProAndonLevelEnum.java @@ -0,0 +1,38 @@ +package cn.iocoder.yudao.module.mes.enums.pro; + +import cn.iocoder.yudao.framework.common.core.ArrayValuable; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * MES 安灯级别枚举 + * + * @author 芋道源码 + */ +@Getter +@AllArgsConstructor +public enum MesProAndonLevelEnum implements ArrayValuable { + + LEVEL1(1, "一级"), + LEVEL2(2, "二级"), + LEVEL3(3, "三级"); + + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProAndonLevelEnum::getLevel).toArray(Integer[]::new); + + /** + * 级别值 + */ + private final Integer level; + /** + * 级别名 + */ + private final String name; + + @Override + public Integer[] array() { + return ARRAYS; + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProAndonStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProAndonStatusEnum.java new file mode 100644 index 0000000..3a7f759 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProAndonStatusEnum.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.module.mes.enums.pro; + +import cn.iocoder.yudao.framework.common.core.ArrayValuable; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * MES 安灯处置状态枚举 + * + * @author 芋道源码 + */ +@Getter +@AllArgsConstructor +public enum MesProAndonStatusEnum implements ArrayValuable { + + ACTIVE(0, "未处置"), + HANDLED(1, "已处置"); + + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProAndonStatusEnum::getStatus).toArray(Integer[]::new); + + /** + * 状态值 + */ + private final Integer status; + /** + * 状态名 + */ + private final String name; + + @Override + public Integer[] array() { + return ARRAYS; + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProFeedbackStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProFeedbackStatusEnum.java new file mode 100644 index 0000000..ad92896 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProFeedbackStatusEnum.java @@ -0,0 +1,40 @@ +package cn.iocoder.yudao.module.mes.enums.pro; + +import cn.iocoder.yudao.framework.common.core.ArrayValuable; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * MES 生产报工状态枚举 + * + * @author 芋道源码 + */ +@Getter +@AllArgsConstructor +public enum MesProFeedbackStatusEnum implements ArrayValuable { + + PREPARE(0, "草稿"), + APPROVING(1, "审批中"), + UNCHECK(2, "待检验"), + FINISHED(3, "已完成"), + CANCELED(4, "已取消"); + + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProFeedbackStatusEnum::getStatus).toArray(Integer[]::new); + + /** + * 状态值 + */ + private final Integer status; + /** + * 状态名 + */ + private final String name; + + @Override + public Integer[] array() { + return ARRAYS; + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProFeedbackTypeEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProFeedbackTypeEnum.java new file mode 100644 index 0000000..14db1e3 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/pro/MesProFeedbackTypeEnum.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.module.mes.enums.pro; + +import cn.iocoder.yudao.framework.common.core.ArrayValuable; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * MES 生产报工类型枚举 + * + * @author 芋道源码 + */ +@Getter +@AllArgsConstructor +public enum MesProFeedbackTypeEnum implements ArrayValuable { + + SELF(1, "自行报工"), + UNIFIED(2, "统一报工"); + + public static final Integer[] ARRAYS = Arrays.stream(values()).map(MesProFeedbackTypeEnum::getType).toArray(Integer[]::new); + + /** + * 类型值 + */ + private final Integer type; + /** + * 类型名 + */ + private final String name; + + @Override + public Integer[] array() { + return ARRAYS; + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonConfigService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonConfigService.java new file mode 100644 index 0000000..7ec9103 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonConfigService.java @@ -0,0 +1,63 @@ +package cn.iocoder.yudao.module.mes.service.pro.andon; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.config.MesProAndonConfigPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.config.MesProAndonConfigSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.andon.MesProAndonConfigDO; +import jakarta.validation.Valid; + +import java.util.List; + +/** + * MES 安灯呼叫配置 Service 接口 + * + * @author 芋道源码 + */ +public interface MesProAndonConfigService { + + /** + * 创建安灯呼叫配置 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createAndonConfig(@Valid MesProAndonConfigSaveReqVO createReqVO); + + /** + * 更新安灯呼叫配置 + * + * @param updateReqVO 更新信息 + */ + void updateAndonConfig(@Valid MesProAndonConfigSaveReqVO updateReqVO); + + /** + * 删除安灯呼叫配置 + * + * @param id 编号 + */ + void deleteAndonConfig(Long id); + + /** + * 获得安灯呼叫配置 + * + * @param id 编号 + * @return 安灯呼叫配置 + */ + MesProAndonConfigDO getAndonConfig(Long id); + + /** + * 获得安灯呼叫配置分页 + * + * @param pageReqVO 分页查询 + * @return 安灯呼叫配置分页 + */ + PageResult getAndonConfigPage(MesProAndonConfigPageReqVO pageReqVO); + + /** + * 获得安灯呼叫配置列表 + * + * @return 安灯呼叫配置列表 + */ + List getAndonConfigList(); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonConfigServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonConfigServiceImpl.java new file mode 100644 index 0000000..81d77f9 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonConfigServiceImpl.java @@ -0,0 +1,81 @@ +package cn.iocoder.yudao.module.mes.service.pro.andon; + +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.pro.andon.vo.config.MesProAndonConfigPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.config.MesProAndonConfigSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.andon.MesProAndonConfigDO; +import cn.iocoder.yudao.module.mes.dal.mysql.pro.andon.MesProAndonConfigMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import java.util.List; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_ANDON_CONFIG_NOT_EXISTS; + +/** + * MES 安灯呼叫配置 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class MesProAndonConfigServiceImpl implements MesProAndonConfigService { + + @Resource + private MesProAndonConfigMapper andonConfigMapper; + + @Override + public Long createAndonConfig(MesProAndonConfigSaveReqVO createReqVO) { + // TODO @AI:userid、roleid 存在; + + // 插入 + MesProAndonConfigDO config = BeanUtils.toBean(createReqVO, MesProAndonConfigDO.class); + andonConfigMapper.insert(config); + return config.getId(); + } + + @Override + public void updateAndonConfig(MesProAndonConfigSaveReqVO updateReqVO) { + // 校验存在 + validateAndonConfigExists(updateReqVO.getId()); + // TODO @AI:userid、roleid 存在; + + // 更新 + MesProAndonConfigDO updateObj = BeanUtils.toBean(updateReqVO, MesProAndonConfigDO.class); + andonConfigMapper.updateById(updateObj); + } + + @Override + public void deleteAndonConfig(Long id) { + // 校验存在 + validateAndonConfigExists(id); + + // 删除 + andonConfigMapper.deleteById(id); + } + + private void validateAndonConfigExists(Long id) { + if (andonConfigMapper.selectById(id) == null) { + throw exception(PRO_ANDON_CONFIG_NOT_EXISTS); + } + } + + @Override + public MesProAndonConfigDO getAndonConfig(Long id) { + return andonConfigMapper.selectById(id); + } + + @Override + public PageResult getAndonConfigPage(MesProAndonConfigPageReqVO pageReqVO) { + return andonConfigMapper.selectPage(pageReqVO); + } + + @Override + public List getAndonConfigList() { + return andonConfigMapper.selectList(); + } + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonRecordService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonRecordService.java new file mode 100644 index 0000000..667d9bc --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonRecordService.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.mes.service.pro.andon; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.record.MesProAndonRecordHandleReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.record.MesProAndonRecordPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.record.MesProAndonRecordSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.andon.MesProAndonRecordDO; +import jakarta.validation.Valid; + +/** + * MES 安灯呼叫记录 Service 接口 + * + * @author 芋道源码 + */ +public interface MesProAndonRecordService { + + /** + * 创建安灯呼叫记录 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createAndonRecord(@Valid MesProAndonRecordSaveReqVO createReqVO); + + /** + * 删除安灯呼叫记录 + * + * @param id 编号 + */ + void deleteAndonRecord(Long id); + + /** + * 处置安灯呼叫记录 + * + * @param handleReqVO 处置信息 + */ + void handleAndonRecord(@Valid MesProAndonRecordHandleReqVO handleReqVO); + + /** + * 获得安灯呼叫记录 + * + * @param id 编号 + * @return 安灯呼叫记录 + */ + MesProAndonRecordDO getAndonRecord(Long id); + + /** + * 获得安灯呼叫记录分页 + * + * @param pageReqVO 分页查询 + * @return 安灯呼叫记录分页 + */ + PageResult getAndonRecordPage(MesProAndonRecordPageReqVO pageReqVO); + +} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonRecordServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonRecordServiceImpl.java new file mode 100644 index 0000000..72f00de --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/andon/MesProAndonRecordServiceImpl.java @@ -0,0 +1,88 @@ +package cn.iocoder.yudao.module.mes.service.pro.andon; + +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.pro.andon.vo.record.MesProAndonRecordHandleReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.record.MesProAndonRecordPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.andon.vo.record.MesProAndonRecordSaveReqVO; +import cn.iocoder.yudao.module.mes.dal.dataobject.pro.andon.MesProAndonRecordDO; +import cn.iocoder.yudao.module.mes.dal.mysql.pro.andon.MesProAndonRecordMapper; +import cn.iocoder.yudao.module.mes.enums.pro.MesProAndonStatusEnum; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_ANDON_RECORD_ALREADY_HANDLED; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_ANDON_RECORD_NOT_EXISTS; + +/** + * MES 安灯呼叫记录 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class MesProAndonRecordServiceImpl implements MesProAndonRecordService { + + @Resource + private MesProAndonRecordMapper andonRecordMapper; + + @Override + public Long createAndonRecord(MesProAndonRecordSaveReqVO createReqVO) { + // TODO @AI:关联数据存在 + + // 插入 + MesProAndonRecordDO record = BeanUtils.toBean(createReqVO, MesProAndonRecordDO.class); + record.setStatus(MesProAndonStatusEnum.ACTIVE.getStatus()); + andonRecordMapper.insert(record); + return record.getId(); + } + + @Override + public void deleteAndonRecord(Long id) { + // 校验存在 + validateAndonRecordExists(id); + // TODO @AI:已处理,不能删除。可以抽个方法,这样下面的 1.2 也可以服用; + + // 删除 + andonRecordMapper.deleteById(id); + } + + @Override + public void handleAndonRecord(MesProAndonRecordHandleReqVO handleReqVO) { + // 1.1 校验存在 + MesProAndonRecordDO record = validateAndonRecordExists(handleReqVO.getId()); + // 1.2 校验未处置 + if (ObjUtil.equal(record.getStatus(), MesProAndonStatusEnum.HANDLED.getStatus())) { + throw exception(PRO_ANDON_RECORD_ALREADY_HANDLED); + } + + // 2. 更新为已处置 + andonRecordMapper.updateById(new MesProAndonRecordDO().setId(handleReqVO.getId()) + .setStatus(MesProAndonStatusEnum.HANDLED.getStatus()) + .setHandleTime(handleReqVO.getHandleTime()) + .setHandlerUserId(handleReqVO.getHandlerUserId()) + .setRemark(handleReqVO.getRemark())); + } + + private MesProAndonRecordDO validateAndonRecordExists(Long id) { + MesProAndonRecordDO record = andonRecordMapper.selectById(id); + if (record == null) { + throw exception(PRO_ANDON_RECORD_NOT_EXISTS); + } + return record; + } + + @Override + public MesProAndonRecordDO getAndonRecord(Long id) { + return andonRecordMapper.selectById(id); + } + + @Override + public PageResult getAndonRecordPage(MesProAndonRecordPageReqVO pageReqVO) { + return andonRecordMapper.selectPage(pageReqVO); + } + +}