From f3481e45dbca9adac7e95c4f7c6f1bd08d681fc2 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 21 十一月 2024 08:40:01 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java index 6eff33b..2b43c73 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java @@ -30,24 +30,27 @@ } public enum PosType { - MOVE(0), - ORI_LOC(0), - ORI_STA(0), - DEST_LOC(INF), - DEST_STA(INF), - TO_CHARGE(INF * 10), - TO_STANDBY(INF * 10), + MOVE(0, "MOVE"), + ORI_LOC(0, "ORIGIN"), + ORI_STA(0, "ORIGIN"), + DEST_LOC(INF, "DESTINATION"), + DEST_STA(INF, "DESTINATION"), + TO_CHARGE(INF * 10, "TO_CHARGE"), + TO_STANDBY(INF * 10, "TO_STANDBY"), ; public int compOffset; + public String brief; - PosType(int compOffset) { + PosType(int compOffset, String brief) { this.compOffset = compOffset; + this.brief = brief; } + } public static void packagePosGroup(Map<String, List<TaskPosDto>> groups, Task task, Code code, PosType posType, String sameGroupXy) { - String key = ("Y".equals(sameGroupXy) ? code.getY() : code.getX()) + posType.toString(); + String key = ("Y".equals(sameGroupXy) ? code.getY() : code.getX()) + posType.brief; Long taskId = task == null ? 0L : task.getId(); TaskPosDto taskPosDto = new TaskPosDto(taskId, new Double[]{code.getX(), code.getY()}, posType); taskPosDto.setCodeId(code.getId()); -- Gitblit v1.9.1