diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workrecord/MesProWorkRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workrecord/MesProWorkRecordController.java index 3da9ca8..2b95fa0 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workrecord/MesProWorkRecordController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workrecord/MesProWorkRecordController.java @@ -9,6 +9,7 @@ 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.workrecord.vo.MesProWorkRecordLogPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.pro.workrecord.vo.MesProWorkRecordLogRespVO; +import cn.iocoder.yudao.module.mes.controller.admin.pro.workrecord.vo.MesProWorkRecordRespVO; import cn.iocoder.yudao.module.mes.dal.dataobject.md.workstation.MesMdWorkstationDO; import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workrecord.MesProWorkRecordDO; import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workrecord.MesProWorkRecordLogDO; @@ -99,7 +100,7 @@ public class MesProWorkRecordController { @GetMapping("/get-my") @Operation(summary = "获取当前用户绑定的工作站状态") @PreAuthorize("@ss.hasPermission('mes:pro-workrecord:query')") - public CommonResult getMyWorkRecord() { + public CommonResult getMyWorkRecord() { MesProWorkRecordDO record = workRecordService.getWorkRecord(getLoginUserId()); return success(buildWorkRecordRespVO(record)); } @@ -131,13 +132,11 @@ public class MesProWorkRecordController { }); } - private MesProWorkRecordLogRespVO buildWorkRecordRespVO(MesProWorkRecordDO record) { + private MesProWorkRecordRespVO buildWorkRecordRespVO(MesProWorkRecordDO record) { if (record == null) { return null; } - MesProWorkRecordLogRespVO vo = new MesProWorkRecordLogRespVO() - .setUserId(record.getUserId()).setWorkstationId(record.getWorkstationId()) - .setCreateTime(record.getClockInTime()); // 前端显示为上工时间 + MesProWorkRecordRespVO vo = BeanUtils.toBean(record, MesProWorkRecordRespVO.class); // 拼接工作站信息 MesMdWorkstationDO ws = workstationService.getWorkstation(record.getWorkstationId()); if (ws != null) { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workrecord/vo/MesProWorkRecordRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workrecord/vo/MesProWorkRecordRespVO.java new file mode 100644 index 0000000..5d44447 --- /dev/null +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workrecord/vo/MesProWorkRecordRespVO.java @@ -0,0 +1,38 @@ +package cn.iocoder.yudao.module.mes.controller.admin.pro.workrecord.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - MES 当前用户工作站绑定状态 Response VO") +@Data +@Accessors(chain = true) +public class MesProWorkRecordRespVO { + + @Schema(description = "用户编号", example = "1") + private Long userId; + + @Schema(description = "用户昵称", example = "张三") + private String userNickname; + + @Schema(description = "工作站编号", example = "1") + private Long workstationId; + + @Schema(description = "工作站编码", example = "WS-001") + private String workstationCode; + + @Schema(description = "工作站名称", example = "注塑工作站") + private String workstationName; + + @Schema(description = "当前状态", example = "1") + private Integer type; + + @Schema(description = "上工时间") + private LocalDateTime clockInTime; + + @Schema(description = "下工时间") + private LocalDateTime clockOutTime; + +}