修复bug

‘liusuyi’

2023-11-29 2574db703fa175765394dba9d4e0d623a1bcd16a

 src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java

@@ -35,35 +35,17 @@

    private final static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);

    public static List<ArdEquipExternal> ardAlarmHostList = new ArrayList<>();
    public static List<ArdEquipExternal> ardAccessHostList = new ArrayList<>();
    public static List<ArdEquipExternal> ardSuperBrainHostList = new ArrayList<>();
    public static List<ArdEquipExternal> ardEquipExternalList = new ArrayList<>();
    @Resource
    private ArdEquipExternalMapper ardEquipExternalMapper;

    @Override
    public void run(ApplicationArguments args) {
        //获取全部海康报警主机尝试登录
        ArdEquipExternal alarmHost = new ArdEquipExternal();
        alarmHost.setFactory("1");
        alarmHost.setType("1");
        ardAlarmHostList = selectArdEquipExternalList(alarmHost);
        HikClientUtil.loginAllAlarmHost(ardAlarmHostList);
        log.debug("报警主机尝试登录");
        //获取全部门禁主机尝试登录
        ArdEquipExternal accessControlHost = new ArdEquipExternal();
        accessControlHost.setFactory("1");
        accessControlHost.setType("6");
        ardAccessHostList = selectArdEquipExternalList(accessControlHost);
        HikClientUtil.loginAllAccessControlHost(ardAccessHostList);
        log.debug("门禁主机尝试登录");
        //获取全部超脑尝试登录
        ArdEquipExternal superBrainHost = new ArdEquipExternal();
        superBrainHost.setFactory("1");
        superBrainHost.setType("5");
        ardSuperBrainHostList = selectArdEquipExternalList(superBrainHost);
        HikClientUtil.loginAllSuperBrainHost(ardSuperBrainHostList);
        log.debug("超脑尝试登录");
        List<String> targetTypes = Arrays.asList("1", "5", "6");
        List<ArdEquipExternal> ardEquipExternals = selectArdEquipExternalListByTypes(targetTypes);
        HikClientUtil.loginAllArdEquipExternals(ardEquipExternals);
        ardEquipExternalList.addAll(ardEquipExternals);
        log.debug("外联设备尝试登录");
        //同步任务
        syncTask();
    }
@@ -76,94 +58,31 @@
    private void syncTask() {
        scheduler.scheduleAtFixedRate(() -> {
            try {
                //region 定时同步报警主机
                ArdEquipExternal alarmHost = new ArdEquipExternal();
                alarmHost.setFactory("1");
                alarmHost.setType("1");
                List<ArdEquipExternal> newAlarmHostList = selectArdEquipExternalList(alarmHost);
                //region 定时同步外联设备
                List<String> targetTypes = Arrays.asList("1", "5", "6");
                List<ArdEquipExternal> ardEquipExternalsNew = selectArdEquipExternalListByTypes(targetTypes);
                //需要更新的数据
                List<ArdEquipExternal> updateList = sameListWithDifferent(ardAlarmHostList, newAlarmHostList);
                List<ArdEquipExternal> updateList = sameListWithDifferent(ardEquipExternalList, ardEquipExternalsNew);
                if (updateList.size() > 0) {
                    HikClientUtil.logoutAllAlarmHost(updateList);
                    HikClientUtil.loginAllAlarmHost(updateList);
                    ardAlarmHostList.clear();
                    ardAlarmHostList.addAll(newAlarmHostList);
                    HikClientUtil.logoutAllArdEquipExternals(updateList);
                    HikClientUtil.loginAllArdEquipExternals(updateList);
                    ardEquipExternalList.clear();
                    ardEquipExternalList.addAll(ardEquipExternalsNew);
                }
                //需要删除的数据
                List<ArdEquipExternal> delList = diffList(ardAlarmHostList, newAlarmHostList);
                List<ArdEquipExternal> delList = diffList(ardEquipExternalList, ardEquipExternalsNew);
                if (delList.size() > 0) {
                    HikClientUtil.logoutAllAlarmHost(delList);
                    HikClientUtil.logoutAllArdEquipExternals(delList);
                    for (ArdEquipExternal ardEquipExternal : delList) {
                        ardAlarmHostList.remove(ardEquipExternal);
                        ardEquipExternalList.remove(ardEquipExternal);
                    }
                }
                //需要新增的数据
                List<ArdEquipExternal> inserList = diffList(newAlarmHostList, ardAlarmHostList);
                List<ArdEquipExternal> inserList = diffList(ardEquipExternalsNew, ardEquipExternalList);
                if (inserList.size() > 0) {
                    HikClientUtil.loginAllAlarmHost(inserList);
                    HikClientUtil.loginAllArdEquipExternals(inserList);
                    for (ArdEquipExternal ardEquipExternal : inserList) {
                        ardAlarmHostList.add(ardEquipExternal);
                    }
                }

                //endregion
                //region 定时同步门禁主机
                ArdEquipExternal accessHost = new ArdEquipExternal();
                accessHost.setFactory("1");
                accessHost.setType("6");
                List<ArdEquipExternal> newAccessHostList = selectArdEquipExternalList(accessHost);
                //需要更新的数据
                updateList = sameListWithDifferent(ardAccessHostList, newAccessHostList);
                if (updateList.size() > 0) {
                    HikClientUtil.logoutAllAlarmHost(updateList);
                    HikClientUtil.loginAllAlarmHost(updateList);
                    ardAccessHostList.clear();
                    ardAccessHostList.addAll(newAccessHostList);
                }
                //需要删除的数据
                delList = diffList(ardAccessHostList, newAccessHostList);
                if (delList.size() > 0) {
                    HikClientUtil.logoutAllAccessControlHost(delList);
                    for (ArdEquipExternal ardEquipExternal : delList) {
                        ardAccessHostList.remove(ardEquipExternal);
                    }
                }
                //需要新增的数据
                inserList = diffList(newAccessHostList, ardAccessHostList);
                if (inserList.size() > 0) {
                    HikClientUtil.loginAllAccessControlHost(inserList);
                    for (ArdEquipExternal ardEquipExternal : inserList) {
                        ardAccessHostList.add(ardEquipExternal);
                    }
                }
                //endregion
                //region 定时同步超脑
                ArdEquipExternal superBrainHost = new ArdEquipExternal();
                superBrainHost.setFactory("1");
                superBrainHost.setType("5");
                List<ArdEquipExternal> newSuperBrainList = selectArdEquipExternalList(superBrainHost);
                //需要更新的数据
                updateList = sameListWithDifferent(ardSuperBrainHostList, newSuperBrainList);
                if (updateList.size() > 0) {
                    HikClientUtil.logoutAllSuperBrainHost(updateList);
                    HikClientUtil.loginAllSuperBrainHost(updateList);
                    ardSuperBrainHostList.clear();
                    ardSuperBrainHostList.addAll(newSuperBrainList);
                }
                //需要删除的数据
                delList = diffList(ardSuperBrainHostList, newSuperBrainList);
                if (delList.size() > 0) {
                    HikClientUtil.logoutAllSuperBrainHost(delList);
                    for (ArdEquipExternal ardEquipExternal : delList) {
                        ardSuperBrainHostList.remove(ardEquipExternal);
                    }
                }
                //需要新增的数据
                inserList = diffList(newSuperBrainList, ardSuperBrainHostList);
                if (inserList.size() > 0) {
                    HikClientUtil.loginAllSuperBrainHost(inserList);
                    for (ArdEquipExternal ardEquipExternal : inserList) {
                        ardSuperBrainHostList.add(ardEquipExternal);
                        ardEquipExternalList.add(ardEquipExternal);
                    }
                }
                //endregion
@@ -173,18 +92,12 @@
        }, 10, 10, TimeUnit.SECONDS);
    }


    /**
     * 查询external
     *
     * @param id external主键
     * @return external
     * @param ardEquipExternal external
     * @return external集合
     */
    @Override
    public ArdEquipExternal selectArdEquipExternalById(String id) {
        return ardEquipExternalMapper.selectById(id);
    }

    @Override
    public ArdEquipExternal selectArdEquipExternal(ArdEquipExternal ardEquipExternal) {
        QueryWrapper<ArdEquipExternal> queryWrapper = new QueryWrapper<>(ardEquipExternal);
@@ -192,17 +105,17 @@
    }

    /**
     * 查询external列表
     * 按类型列表查询external列表
     *
     * @param ardEquipExternal external
     * @param types 类型列表
     * @return external
     */
    @Override
    public List<ArdEquipExternal> selectArdEquipExternalList(ArdEquipExternal ardEquipExternal) {
        QueryWrapper<ArdEquipExternal> queryWrapper = new QueryWrapper<>(ardEquipExternal);
    public List<ArdEquipExternal> selectArdEquipExternalListByTypes(List<String> types) {
        QueryWrapper<ArdEquipExternal> queryWrapper = new QueryWrapper<>();
        queryWrapper.in("type", types);
        return ardEquipExternalMapper.selectList(queryWrapper);
    }


    //求两个对象List的交集字段不同Id相同
    private List<ArdEquipExternal> sameListWithDifferent(List<ArdEquipExternal> oldList, List<ArdEquipExternal> newList) {
@@ -224,8 +137,6 @@

        return differentFieldsList;
    }


    //  求两个对象List的差集
    private List<ArdEquipExternal> diffList(List<ArdEquipExternal> oldArrayList, List<ArdEquipExternal> newArrayList) {
        List<ArdEquipExternal> resultList = oldArrayList.stream()