1

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -165,16 +165,12 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             cameraDetail.setCountry(0);//默认中国
             String wifiNamePrix = camera.getWifiName().split("_")[0];
             CameraType cameraType = cameraTypeMap.get(wifiNamePrix);
-            Integer type = cameraType.getCameraType();
-            cameraDetail.setType(type);
+            cameraDetail.setType(cameraType.getCameraType());
 
             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 && type != 13){
-                type = type == 0 ? 1: 4;
-            }
             if("aws".equals(CacheUtil.uploadType)){
                 cameraDetail.setCountry(1);//1-国外
             }