相机类型

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

@@ -137,7 +137,7 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
                     AuthorizeCameraDetail detail = new AuthorizeCameraDetail();
                     detail.setSnCode(snCode);
                     detail.setCameraId(camera.getId());
-                    detail.setCameraType(CameraUtils.getCameraType(cameraDetail.getType()));
+                    detail.setCameraType(cameraDetail.getType());
                     detail.setCameraTypeStr(CameraUtils.getCameraTypeStr(detail.getCameraType()));
                     detailHashMap.put(snCode,detail);
                 }
@@ -192,7 +192,7 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
         if(byCameraId == null){
             throw new BusinessException(ResultCode.UPDATE_CAMERA_NO_IN);
         }
-        if(!CameraUtils.getCameraType(byCameraId.getType()).equals(cameraDetail.getCameraType())){
+        if(!byCameraId.getType().equals(cameraDetail.getCameraType())){
             throw new BusinessException(ResultCode.CAMERA_AUTHORIZE_TYPE_ERROR);
         }
         try {
@@ -210,7 +210,7 @@ public class AuthorizeCameraServiceImpl extends ServiceImpl<IAuthorizeCameraMapp
                 throw new BusinessException(ResultCode.GET_MACHINE_CODE_ERROR);
             }
             AuthorizeCameraLog authorizeCameraLog = authorizeCameraLogService.saveLog(cameraDetail, snCode, authorizeKey);
-            authorizeCameraDetailService.updateSnCode(cameraDetail.getId(),bySnCode.getId(),CameraUtils.getCameraType(byCameraId.getType()),snCode);
+            authorizeCameraDetailService.updateSnCode(cameraDetail.getId(),bySnCode.getId(),byCameraId.getType(),snCode);
             return authorizeCameraLog;
         }catch (Exception e){
             throw new BusinessException(ResultCode.GET_MACHINE_CODE_ERROR);

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

@@ -639,7 +639,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
             List<CameraDetail> cameraIds1 = cameraDetailService.getByCameraIds(cameraList.stream().map(Camera::getId).collect(Collectors.toList()));
             for (CameraDetail cameraDetail : cameraIds1) {
-                snCodeMap.put(cameraMap.get(cameraDetail.getCameraId()), CameraUtils.getCameraTypeStr(CameraUtils.getCameraType(cameraDetail.getType())));
+                snCodeMap.put(cameraMap.get(cameraDetail.getCameraId()), CameraUtils.getCameraTypeStr(cameraDetail.getType()));
             }
         }
 

src/main/java/com/fdkankan/manage/util/CameraUtils.java

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