根据相机snCode，获取场景数量

4dkankan-center-api/4dkankan-center-scene-api/src/main/java/com/fdkankan/scene/api/feign/SceneUserSceneClient.java

@@ -20,7 +20,9 @@ public interface SceneUserSceneClient {
     ResultData<SceneCntDTO> getSceneCnt(@RequestParam(value = "userId") Long userId, @RequestParam(value = "cameraId") Long cameraId) ;
 
     @PostMapping("/getSceneNumByCameraId")
-    ResultData<Integer> getSceneNumByCameraId(@RequestParam(value = "cameraId") Long cameraId) ;
+    ResultData<Integer> getSceneNumByCameraId(@RequestParam(value = "cameraId") Long cameraId,
+                                              @RequestParam(value = "cameraType")Integer cameraType,
+                                              @RequestParam(value = "snCode")String snCode) ;
 
     @PostMapping("/getLastSceneByCameraId")
     ResultData<SceneProDTO> getLastSceneByCameraId(@RequestParam(value = "cameraId") Long cameraId) ;

4dkankan-center-platform/src/main/java/com/fdkankan/platform/feign/GoodsFeign.java

@@ -72,7 +72,6 @@ public class GoodsFeign {
 
     @PostMapping("/getCameraById")
     public Camera getCameraById(@RequestParam(value = "cameraId") Long cameraId) {
-        sceneUserSceneClient.getSceneNumByCameraId(1L);
         Camera camera = cameraService.getAvailableById(cameraId);
         return camera;
     }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CameraServiceImpl.java

@@ -157,7 +157,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
                 }
             }
             ResultData<Integer> sceneNumResult = sceneUserSceneClient
-                .getSceneNumByCameraId(responseCamera.getId());
+                .getSceneNumByCameraId(responseCamera.getId(),responseCamera.getType(),responseCamera.getSnCode());
             if(!sceneNumResult.getSuccess())
                 throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
             responseCamera.setSceneNum(sceneNumResult.getData());

4dkankan-center-scene/src/main/java/com/fdkankan/scene/feign/UserSceenFeign.java

@@ -62,8 +62,10 @@ public class UserSceenFeign {
     }
 
     @PostMapping("/getSceneNumByCameraId")
-    public ResultData<Integer> getSceneNumByCameraId(@RequestParam(value = "cameraId") Long cameraId){
-        Integer sceneNum = userSceneService.getSceneNumByCameraId(cameraId);
+    ResultData<Integer> getSceneNumByCameraId(@RequestParam(value = "cameraId") Long cameraId,
+                                              @RequestParam(value = "cameraType")Integer cameraType,
+                                              @RequestParam(value = "snCode")String snCode) {
+        Integer sceneNum = userSceneService.getSceneNumByCameraId(cameraId,cameraType,snCode);
         return ResultData.ok(sceneNum);
     }
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/IFdkkLaserService.java

@@ -24,4 +24,6 @@ public interface IFdkkLaserService {
     SceneNumVo getLaserSceneNumByUser(String token);
 
     List<SceneBySnCodeVo> getScenesBySnCode(String snCode, String token);
+
+    Integer getLaserSceneNum(String snCode);
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/IUserSceneService.java

@@ -26,7 +26,7 @@ public interface IUserSceneService {
 
     ResultData getNewScenes(SceneParamVO param) throws Exception;
 
-    Integer getSceneNumByCameraId(Long cameraId);
+    Integer getSceneNumByCameraId(Long cameraId,Integer cameraType,String snCode);
 
     SceneProDTO getLastSceneByCameraId( Long cameraId);
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/IFdkkLaserServiceImpl.java

@@ -32,6 +32,7 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
     private final String ENABLE_COOPERATION_CAMERA_URL="/laser/4dage/scene/cooperation/cameraSave";
     private final String GET_LASER_SCENE_USER_URL="/laser/4dage/getSceneNum";
     private final String GET_LASER_SCENE_CODE_URL="/laser/4dage/scene/getScenesBySnCode";
+    private final String GET_LASER_SCENE_CNT_URL="/laser/4dage/scene/getSceneNumByCamera";
 
     @Value("${4dkk.laserService.host}")
     private String laserHost;
@@ -142,6 +143,26 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
         return sceneVo ;
     }
 
+    /**
+     * 根据 snCode 获取激光场景场景数量
+     */
+    public Integer getLaserSceneNum(String snCode){
+        Map<String, String> params = new HashMap<>();
+        params.put("snCode",snCode);
+        try {
+            String url = laserHost + GET_LASER_SCENE_CNT_URL;
+            log.info("获取激光转台相机场景数，url:{},params:{}",GET_LASER_SCENE_CNT_URL, JSONObject.toJSONString(params));
+            ResponseEntity<Result> responseEntity = restTemplate.postForEntity(url,params, Result.class);
+            log.info("获取激光转台相机场景数，url:{},params:{},结果:{}",url, JSONObject.toJSONString(params),JSONObject.toJSONString(responseEntity.getBody()));
+            if(responseEntity.getStatusCode() != HttpStatus.OK || responseEntity.getBody().getCode() != HttpStatus.OK.value()){
+                log.error("自研激光转台相机协作失败!");
+            }
+            return (Integer) responseEntity.getBody().getData();
+        }catch (Exception e){
+            log.error("自研激光转台相机协作失败!",e);
+        }
+        return 0;
+    }
     @Data
     public static class Result<T> implements Serializable {
         private static final long serialVersionUID = -1491499610244557029L;

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/UserSceneServiceImpl.java

@@ -280,7 +280,10 @@ public class UserSceneServiceImpl implements IUserSceneService {
     }
 
     @Override
-    public Integer getSceneNumByCameraId(Long cameraId) {
+    public Integer getSceneNumByCameraId(Long cameraId,Integer cameraType,String snCode) {
+        if(cameraType == 10){
+            return fdkkLaserService.getLaserSceneNum(snCode);
+        }
         Long cnt = sceneProService.findSceneNumByCameraId(cameraId);
         return Integer.parseInt(String.valueOf(cnt));
     }