Merge branch 'master' of E:\job\projects\changjingku\仿真云平台\develop\simulation-cloud with conflicts.

api-common/src/main/java/api/common/pojo/constants/DictConstants.java

@@ -3,7 +3,7 @@ package api.common.pojo.constants;
 public class DictConstants {
 
     //字典缓存目录key
-    public static final String BASE_KEY = "DICT:";
+    public static final String BASE_KEY = "GQ-DICT:";
     public static final String LIST_KEY = "LIST:";
     public static final String MAP_KEY = "MAP:";
 
@@ -25,4 +25,15 @@ public class DictConstants {
     public static final String SENSOR_GPS = "5"; // GPS 传感器表
 
 
+
+    //算法校验状态
+    public static final String WAITING = "1"; //等待校验
+    public static final String RUNNING = "2"; //校验中
+    public static final String SUCCESS = "3"; //校验成功
+    public static final String FAIL = "4"; //校验失败
+
+    //算法上传方式
+    public static final String FILE = "1"; //文件上传
+    public static final String GIT = "2"; //仓库地址
+
 }