From 416ec0563f02d3d5b84f9b1d36bb11afdec721ec Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 05 六月 2024 15:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
index 51a945b..c3e8b22 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -1,5 +1,8 @@
package com.mes.common.config;
+import java.util.Arrays;
+import java.util.List;
+
/**
* @Author : zhoush
* @Date: 2024/4/24 10:33
@@ -31,6 +34,26 @@
public static final Integer GLASS_STATE_IN = 100;
public static final Integer GLASS_STATE_OUT = 101;
public static final Integer GLASS_STATE_TAKE = 200;
- public static final Integer A10_OUT_TARGET_DAMAGE = 201;
+ public static final Integer GLASS_STATE_DAMAGE = 201;
+
+ /**
+ * 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
+ * 杩涚墖浠诲姟1
+ * 鍑虹墖浠诲姟2
+ * 鍑虹墖浠诲姟2
+ */
+ public static final Integer GLASS_CACHE_TYPE_IN = 1;
+ public static final Integer GLASS_CACHE_TYPE_OUT = 2;
+ public static final Integer GLASS_CACHE_TYPE_THROUGH = 3;
+ public static final List<Integer> GLASS_CACHE_TYPE_OUT_ALL = Arrays.asList(2, 3);
+
+ /**
+ * 纾ㄨ竟浠诲姟鐜荤拑鐘舵��
+ * 杩涚墖浠诲姟1
+ * 鍑虹墖浠诲姟2
+ */
+ public static final Integer EDG_GLASS_BEFORE = 0;
+ public static final Integer EDG_GLASS_START = 1;
+ public static final Integer EDG_GLASS_SUCCESS = 2;
}
--
Gitblit v1.8.0