Pārlūkot izejas kodu

相机入库支持深光相机

lyhzzz 2 gadi atpakaļ
vecāks
revīzija
1350c313aa

+ 2 - 1
src/main/java/com/fdkankan/manage/common/CameraTypeEnum.java

@@ -11,7 +11,8 @@ public enum CameraTypeEnum {
     FDKK_LITE(2,"KK-","4DKKLITE_","四维看看lite"),
     ZHIHOUSE_REDHOUSE(5,"KK-","4DKKLITE_","指房宝小红屋相机"),
     DOUBLE_EYE_TURN(9,"KJ-","4DKKMI_","双目转台"),
-    LASER_TURN(10,"SS-","4DSS_","激光转台");
+    LASER_TURN(10,"SS-","4DSS_","深时"),
+    LASER_SG_TURN(13,"SG-","4DSG_","深光");
 
 
     private int type;

+ 2 - 2
src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -149,11 +149,11 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             cameraDetail.setCameraId(camera.getId());
             cameraDetail.setCountry(0);//默认中国
             cameraDetail.setType(type);
-            if (1 == cameraDetail.getType() || 9 == cameraDetail.getType() || 10 == cameraDetail.getType()){
+            if (1 == cameraDetail.getType() || 9 == cameraDetail.getType() || 10 == cameraDetail.getType() || 13 == cameraDetail.getType()){
                 cameraDetail.setTotalSpace(Long.valueOf(Constant.CAMERA_BASE_SPACE_VALUE));
                 cameraDetail.setUsedSpace(0L);
             }
-            if(type != 9 && type != 10){
+            if(type != 9 && type != 10 && type != 13){
                 type = type == 0 ? 1: 4;
             }
             if("aws".equals(CacheUtil.uploadType)){