From f30358a20ae9a74ee7f6c604a8d102c1b9b24659 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 25 六月 2024 16:24:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/enums/SteTaskModeType.java | 103 ++++++++++-----------------------------------------
1 files changed, 20 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/zy/core/enums/SteTaskModeType.java b/src/main/java/com/zy/core/enums/SteTaskModeType.java
index 5bf8d9d..b564564 100644
--- a/src/main/java/com/zy/core/enums/SteTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/SteTaskModeType.java
@@ -8,23 +8,28 @@
public enum SteTaskModeType {
INIT(0, "鍒濆"), // 鍒濆
- OUT_RIGHT(1, "鍙冲嚭搴�"), // 鍙冲嚭搴�
- OUT_LEFT(2, "宸﹀嚭搴�"), // 宸﹀嚭搴�
- IN_RIGHT(4, "鍙冲叆搴�"), // 鍙冲叆搴�
- IN_LEFT(3, "宸﹀叆搴�"), // 宸﹀叆搴�
- MOVE_LEFT(5, "宸︾Щ搴�"), // 宸︾Щ搴�
- MOVE_RIGHT(6, "鍙崇Щ搴�"), // 鍙崇Щ搴�
- GO_ORIGIN(8, "鍘诲彸绔�"), // 鍥炲弽鍘熺偣
- BACK_ORIGIN(7, "鍘诲乏绔�"), // 鍥炲師鐐�
- WAITING_RIGHT(10, "鍙冲緟鏈�"), // A鐐�
- WAITING_LEFT(9, "宸﹀緟鏈�"), // B鐐�
-// FIT_LEFT(11, "宸︽惉绉�"), // 宸︽惉绉�
-// FIT_RIGHT(12, "鍙虫惉绉�"), // 鍙虫惉绉�
- CHARGE_LEFT(13, "宸﹀厖鐢�"), // 宸﹀厖鐢�
- CHARGE_RIGHT(14, "鍙冲厖鐢�"), // 宸﹀厖鐢�
+// OUT_RIGHT(1, "鍙冲嚭搴�"), // 鍙冲嚭搴�
+// OUT_LEFT(2, "宸﹀嚭搴�"), // 宸﹀嚭搴�
+// IN_RIGHT(4, "鍙冲叆搴�"), // 鍙冲叆搴�
+// IN_LEFT(3, "宸﹀叆搴�"), // 宸﹀叆搴�
+// MOVE_LEFT(5, "宸︾Щ搴�"), // 宸︾Щ搴�
+// MOVE_RIGHT(6, "鍙崇Щ搴�"), // 鍙崇Щ搴�
+// GO_ORIGIN(8, "鍘诲彸绔�"), // 鍥炲弽鍘熺偣
+// BACK_ORIGIN(7, "鍘诲乏绔�"), // 鍥炲師鐐�
+// WAITING_RIGHT(10, "鍙冲緟鏈�"), // A鐐�
+// WAITING_LEFT(9, "宸﹀緟鏈�"), // B鐐�
+//// FIT_LEFT(11, "宸︽惉绉�"), // 宸︽惉绉�
+//// FIT_RIGHT(12, "鍙虫惉绉�"), // 鍙虫惉绉�
+// CHARGE_LEFT(13, "宸﹀厖鐢�"), // 宸﹀厖鐢�
+// CHARGE_RIGHT(14, "鍙冲厖鐢�"), // 宸﹀厖鐢�
// CHECK_LEFT(14, "宸︾洏鐐�"), // 宸︾洏鐐�
// CHECK_RIGHT(15, "鍙崇洏鐐�"), // 鍙崇洏鐐�
- CLOSE_CHARGE(17, "鏂紑鍏呯數"), // 鏂紑鍏呯數
+ STE_YDQH_10(10,"鍘熷湴鍙栬揣"),
+ STE_YDFH_11(11,"鍘熷湴鏀捐揣"),
+ STE_WFQH_12(12,"寰�杩斿彇璐�"),
+ STE_WFFH_13(13,"寰�杩旀斁璐�"),
+ STE_MOVE_14(14,"绉诲姩"),
+// CLOSE_CHARGE(17, "鏂紑鍏呯數"), // 鏂紑鍏呯數
;
public Integer id;
@@ -56,74 +61,6 @@
}
}
return null;
- }
-
- public static SteTaskModeType findInByLoc(String locNo, Integer crnNo) {
- switch (SteUtils.getGroupRow(locNo, true, crnNo)) {
- case 2:
- return SteTaskModeType.IN_RIGHT; // 鍙�
- case 12:
- return SteTaskModeType.IN_LEFT; // 宸�
- default:
- throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
- }
- }
-
- public static SteTaskModeType findOutByLoc(String locNo, Integer crnNo) {
- switch (SteUtils.getGroupRow(locNo, false, crnNo)) {
- case 2:
- return SteTaskModeType.OUT_LEFT; // 鍙�
- case 12:
- return SteTaskModeType.OUT_RIGHT; // 宸�
- default:
- throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
- }
- }
- public static SteTaskModeType findOutByLoc2(String locNo, Integer crnNo) {
- switch (SteUtils.getGroupRow(locNo, false, crnNo)) {
- case 2:
- return SteTaskModeType.GO_ORIGIN; // 8
- case 12:
- return SteTaskModeType.BACK_ORIGIN; // 7
- default:
- throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
- }
- }
-
-
- // -----------------------------------------------
-
- // 鍘诲緟鎼偣
- public static SteTaskModeType findOriginByLoc(SteProtocol steProtocol, Integer crnNo) {
- int row = steProtocol.getRow().intValue();
- if (SteUtils.SHUTTLE_GROUP_ROW_LIST.contains(row)) {
- return crnNo == 1 ? SteTaskModeType.BACK_ORIGIN : SteTaskModeType.GO_ORIGIN;
- } else if (row==13 || row==1){
- return SteTaskModeType.INIT;
- } else {
- throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
- }
- }
-
- public static SteTaskModeType findOriginByLoc(Integer row, Integer crnNo) {
- if (SteUtils.SHUTTLE_GROUP_ROW_LIST.contains(row)) {
- return crnNo == 1 ? SteTaskModeType.BACK_ORIGIN : SteTaskModeType.GO_ORIGIN;
- } else if (row==13 || row==1){
- return SteTaskModeType.INIT;
- } else {
- throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
- }
- }
-
-
- public static SteTaskModeType findWaiting(Integer row, Integer crnNo) {
- if (SteUtils.SHUTTLE_GROUP_ROW_LIST.contains(row)) {
- return crnNo == 1 ? SteTaskModeType.WAITING_LEFT : SteTaskModeType.WAITING_RIGHT;
- } else if (row==1||row==13){
- return SteTaskModeType.INIT;
- } else {
- throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
- }
}
}
--
Gitblit v1.9.1