فهرست منبع

增加枚举值

dsx 2 سال پیش
والد
کامیت
3787fe34c7

+ 27 - 9
4dkankan-common-web/src/main/java/com/fdkankan/web/constant/CameraTypeEnum.java

@@ -1,27 +1,32 @@
-package com.fdkankan.web.constant;
+package com.fdkankan.common.constant;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public enum CameraTypeEnum {
-    DOUBLE_EYE(0,"KK-","4DKKLITE_","旧双目相机"),
-    FDKK_PRO(1,"KK-","4DKKPRO_","四维看看pro八目相机"),
-    FDKK_LITE(2,"KK-","4DKKLITE_","四维看看lite"),
-    ZHIHOUSE_REDHOUSE(5,"KK-","4DKKLITE_","指房宝小红屋相机"),
-    DOUBLE_EYE_TURN(9,"KJ-","4DKKLITE_","双目转台"),
-    LASER_TURN(10,"SS-","4DKKLA_","激光转台"),
-    LASER_SG(11,"SG-","4DSG_","深光");
+    DOUBLE_EYE(0,"KK-","4DKKLITE_","旧双目相机", "4DKanKan"),
+    FDKK_PRO(1,"KK-","4DKKPRO_","四维看看pro八目相机", "4DKanKan"),
+    FDKK_LITE(2,"KK-","4DKKLITE_","四维看看lite", "4DKanKan"),
+    ZHIHOUSE_REDHOUSE(5,"KK-","4DKKLITE_","指房宝小红屋相机", "4DKanKan"),
+    DOUBLE_EYE_TURN(9,"KJ-","4DKKLITE_","双目转台", "4DMinion"),
+    LASER_TURN(10,"SS-","4DKKLA_","激光转台", "4DMega"),
+    LASER_SG(11,"SG-","4DSG_","深光", "4DMega");
 
 
     private int type;
     private String sceneNumPrefix;
     private String wifiNamePrefix;
     private String desc;
+    private String cameraName;
 
     public int getType() {
         return type;
     }
 
+    public String getCameraName() {
+        return cameraName;
+    }
+
     public String getSceneNumPrefix() {
         return sceneNumPrefix;
     }
@@ -34,11 +39,12 @@ public enum CameraTypeEnum {
         }
     }
 
-    CameraTypeEnum(Integer type, String sceneNumPrefix, String wifiNamePrefix, String desc) {
+    CameraTypeEnum(Integer type, String sceneNumPrefix, String wifiNamePrefix, String desc, String cameraName) {
         this.type = type;
         this.sceneNumPrefix = sceneNumPrefix;
         this.wifiNamePrefix = wifiNamePrefix;
         this.desc = desc;
+        this.cameraName = cameraName;
     }
 
     public static String getSceneNumPrefixByType(Integer type){
@@ -48,4 +54,16 @@ public enum CameraTypeEnum {
         return "";
     }
 
+    public static CameraTypeEnum get(int type){
+        CameraTypeEnum[] values = CameraTypeEnum.values();
+        Integer enumValue = null;
+        for(CameraTypeEnum eachValue : values){
+            enumValue = eachValue.getType();
+            if(enumValue.equals(type)){
+                return eachValue;
+            }
+        }
+        return null;
+    }
+
 }

+ 14 - 1
4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/CommonSuccessStatus.java

@@ -9,7 +9,8 @@ package com.fdkankan.common.constant;
  **/
 public enum CommonSuccessStatus {
 
-    Fail(-1, "失败"),
+    FAIL(-1, "失败"),
+    WAITING(0, "等待"),
     SUCCESS(1, "成功");
 
     private Integer code;
@@ -20,6 +21,18 @@ public enum CommonSuccessStatus {
         this.message = message;
     }
 
+    public static CommonSuccessStatus get(Integer code){
+        CommonSuccessStatus[] values = CommonSuccessStatus.values();
+        Integer enumValue = null;
+        for(CommonSuccessStatus eachValue : values){
+            enumValue = eachValue.code();
+            if(enumValue.equals(code)){
+                return eachValue;
+            }
+        }
+        return null;
+    }
+
     public Integer code() {
         return code;
     }