优化通用光电报警只获取小光电数据

‘liusuyi’

2023-08-11 1e89a0c2fc96040ba50d0fe4305ace22f3daa6cf

 src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java

@@ -42,8 +42,10 @@
    public void run(ApplicationArguments args) {
        //加载sdk库
        HikClientUtil.loadHCNetSDKLib();
        //获取全部海康光电尝试登录
        ardCameraList = ardCamerasMapper.selectArdCamerasList(new ArdCameras());
        //获取小光电尝试登录
        ArdCameras ardCamera=new ArdCameras();
        ardCamera.setGdtype("0");
        ardCameraList = ardCamerasMapper.selectArdCamerasList(ardCamera);
        HikClientUtil.loginAllCamera(ardCameraList);
        syncTask();
    }
@@ -56,8 +58,10 @@
    private void syncTask() {
        scheduler.scheduleAtFixedRate(() -> {
            try {
                //region 定时同步相机
                List<ArdCameras> newArdCameraList = ardCamerasMapper.selectArdCamerasList(new ArdCameras());
                //region 定时同步小光电
                ArdCameras ardCamera=new ArdCameras();
                ardCamera.setGdtype("0");
                List<ArdCameras> newArdCameraList = ardCamerasMapper.selectArdCamerasList(ardCamera);
                //需要更新的数据
                List<ArdCameras> updateList = sameListWithDifferent(ardCameraList, newArdCameraList);
                if (updateList.size() > 0) {
@@ -129,12 +133,7 @@
                            .findFirst()
                            .orElse(null);

                    return oldItem == null ||
                            !Objects.equals(oldItem.getUpdateTime(), newItem.getUpdateTime()) ||
                            !Objects.equals(oldItem.getIp(), newItem.getIp()) ||
                            !Objects.equals(oldItem.getPort(), newItem.getPort()) ||
                            !Objects.equals(oldItem.getUsername(), newItem.getUsername()) ||
                            !Objects.equals(oldItem.getPassword(), newItem.getPassword());
                    return oldItem == null || !Objects.equals(oldItem.getUpdateTime(), newItem.getUpdateTime());

                })
                .collect(Collectors.toList());