lyhzzz 2 years ago
parent
commit
149e9065fb

+ 18 - 1
src/main/java/com/fdkankan/manage/entity/AuthorizeCamera.java

@@ -122,5 +122,22 @@ public class AuthorizeCamera implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-
+    @TableField(exist = false)
+    private String useTypeStr;
+
+
+    public String getUseTypeStr() {
+        if(useType == null){
+            return "";
+        }
+        switch (useType){
+            case 1 : return "项目实施";
+            case 2 : return "客户试用";
+            case 3 : return "内部测试";
+            case 4 : return "正常销售";
+            case 5 : return "渠道推广";
+            case 6 : return "其它";
+            default: return "";
+        }
+    }
 }

+ 2 - 0
src/main/java/com/fdkankan/manage/entity/AuthorizeCameraDetail.java

@@ -50,5 +50,7 @@ public class AuthorizeCameraDetail implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    @TableField(exist = false)
+    private String cameraTypeStr;
 
 }

+ 18 - 1
src/main/java/com/fdkankan/manage/entity/AuthorizeInstall.java

@@ -110,5 +110,22 @@ public class AuthorizeInstall implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-
+    @TableField(exist = false)
+    private String useTypeStr;
+
+
+    public String getUseTypeStr() {
+        if(useType == null){
+            return "";
+        }
+        switch (useType){
+            case 1 : return "项目实施";
+            case 2 : return "客户试用";
+            case 3 : return "内部测试";
+            case 4 : return "正常销售";
+            case 5 : return "渠道推广";
+            case 6 : return "其它";
+            default: return "";
+        }
+    }
 }

+ 18 - 1
src/main/java/com/fdkankan/manage/entity/AuthorizeModeling.java

@@ -110,5 +110,22 @@ public class AuthorizeModeling implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-
+    @TableField(exist = false)
+    private String useTypeStr;
+
+
+    public String getUseTypeStr() {
+        if(useType == null){
+            return "";
+        }
+        switch (useType){
+            case 1 : return "项目实施";
+            case 2 : return "客户试用";
+            case 3 : return "内部测试";
+            case 4 : return "正常销售";
+            case 5 : return "渠道推广";
+            case 6 : return "其它";
+            default: return "";
+        }
+    }
 }

+ 1 - 0
src/main/java/com/fdkankan/manage/service/impl/AuthorizeCameraServiceImpl.java

@@ -113,6 +113,7 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
                     detail.setSnCode(snCode);
                     detail.setCameraId(camera.getId());
                     detail.setCameraType(CameraUtils.getCameraType(cameraDetail.getType()));
+                    detail.setCameraTypeStr(CameraUtils.getCameraTypeStr(detail.getCameraType()));
                     detailHashMap.put(snCode,detail);
                 }
                 dtos.setCamRegs(camRegs);

+ 13 - 4
src/main/java/com/fdkankan/manage/util/CameraUtils.java

@@ -8,11 +8,20 @@ public class CameraUtils {
             case 1 :
             case 2 :
             case 5 :
-                return 0;
-            case 9 :return 1;
-            case 10 :return 2;
-            case 11 :return 3;
+                return 1;
+            case 9 :return 2;
+            case 10 :return 3;
+            case 11 :return 4;
         }
         return type;
     }
+    public static  String getCameraTypeStr(Integer type){
+        switch (type){
+            case 0 : return "四维看看";
+            case 1 : return "四维看见";
+            case 2 : return "四维深时";
+            case 3 : return "四维深光";
+        }
+        return "";
+    }
 }