lyhzzz 1 년 전
부모
커밋
23503203cf
1개의 변경된 파일14개의 추가작업 그리고 10개의 파일을 삭제
  1. 14 10
      src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

+ 14 - 10
src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -244,16 +244,20 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
                 }
             }
             CameraType cameraType = cameraTypeService.getByCameraType(responseCamera.getType());
-            if (cameraType.getIsLaser() == 1) {
-                Map<String, String> params = new HashMap<>();
-                params.put("snCode", responseCamera.getSnCode());
-                responseCamera.setSceneNum(fdkkLaserService.getLaserSceneNum(params));
-            }else{
-                Integer sceneNum = sceneNumMap.get(responseCamera.getId()) == null ? 0 : Math.toIntExact(sceneNumMap.get(responseCamera.getId()).getCount());
-                String lastTime = sceneNumMap.get(responseCamera.getId()) == null ? "" : sceneNumMap.get(responseCamera.getId()).getLastTime();
-                responseCamera.setSceneNum(sceneNum);
-                responseCamera.setLastTime(lastTime);
-            }
+//            if (cameraType.getIsLaser() == 1) {
+//                Map<String, String> params = new HashMap<>();
+//                params.put("snCode", responseCamera.getSnCode());
+//                responseCamera.setSceneNum(fdkkLaserService.getLaserSceneNum(params));
+//            }else{
+//                Integer sceneNum = sceneNumMap.get(responseCamera.getId()) == null ? 0 : Math.toIntExact(sceneNumMap.get(responseCamera.getId()).getCount());
+//                String lastTime = sceneNumMap.get(responseCamera.getId()) == null ? "" : sceneNumMap.get(responseCamera.getId()).getLastTime();
+//                responseCamera.setSceneNum(sceneNum);
+//                responseCamera.setLastTime(lastTime);
+//            }
+            Integer sceneNum = sceneNumMap.get(responseCamera.getId()) == null ? 0 : Math.toIntExact(sceneNumMap.get(responseCamera.getId()).getCount());
+            String lastTime = sceneNumMap.get(responseCamera.getId()) == null ? "" : sceneNumMap.get(responseCamera.getId()).getLastTime();
+            responseCamera.setSceneNum(sceneNum);
+            responseCamera.setLastTime(lastTime);
         }
         return PageInfo.PageInfo(page);
     }