配置文件全部更改为配置类 优化包路径

‘liusuyi’

2023-12-05 745d5b90be7d8cdb8873b18d18b286fdc4b6913b

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

@@ -6,17 +6,18 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import com.ard.alarm.camera.domain.ArdCameras;
import com.ard.alarm.external.domain.ArdEquipExternal;
import com.ard.alarm.external.mapper.ArdEquipExternalMapper;
import com.ard.alarm.external.service.IArdEquipExternalService;
import com.ard.utils.hiksdk.service.impl.HikClientUtil;
import com.ard.utils.sdk.hiksdk.service.impl.HikClientUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;


/**
@@ -29,26 +30,21 @@
@Slf4j(topic = "external")
@Order(5)
public class ArdEquipExternalServiceImpl implements IArdEquipExternalService, ApplicationRunner {

    private final static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
    public static List<ArdEquipExternal> ardAlarmHostList = new ArrayList<>();
    public static List<ArdEquipExternal> ardAccessHostList = new ArrayList<>();
    @Autowired

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

    @Override
    public void run(ApplicationArguments args) throws Exception {
        //获取全部海康报警主机尝试登录
        ArdEquipExternal alarmHost = new ArdEquipExternal();
        alarmHost.setFactory("1");
        alarmHost.setType("1");
        ardAlarmHostList = ardEquipExternalMapper.selectArdEquipExternalList(alarmHost);
        HikClientUtil.loginAllAlarmHost(ardAlarmHostList);
        //获取全部门禁主机尝试登录
        ArdEquipExternal accessControlHost = new ArdEquipExternal();
        accessControlHost.setFactory("1");
        accessControlHost.setType("6");
        ardAccessHostList = ardEquipExternalMapper.selectArdEquipExternalList(accessControlHost);
        HikClientUtil.loginAllAccessControlHost(ardAccessHostList);
    public void run(ApplicationArguments args) {
        List<String> targetTypes = Arrays.asList("1", "5", "6");
        List<ArdEquipExternal> ardEquipExternals = selectArdEquipExternalListByTypes(targetTypes);
        HikClientUtil.loginAllArdEquipExternals(ardEquipExternals);
        ardEquipExternalList.addAll(ardEquipExternals);
        log.debug("外联设备尝试登录");
        //同步任务
        syncTask();
    }

@@ -60,64 +56,31 @@
    private void syncTask() {
        scheduler.scheduleAtFixedRate(() -> {
            try {
                //region 定时同步报警主机
                ArdEquipExternal alarmHost = new ArdEquipExternal();
                alarmHost.setFactory("1");
                alarmHost.setType("1");
                List<ArdEquipExternal> newAlarmHostList = ardEquipExternalMapper.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 定时同步门禁主机
                alarmHost = new ArdEquipExternal();
                alarmHost.setFactory("1");
                alarmHost.setType("6");
                List<ArdEquipExternal> newAccessHostList = ardEquipExternalMapper.selectArdEquipExternalList(alarmHost);
                //需要更新的数据
                 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);
                        ardEquipExternalList.add(ardEquipExternal);
                    }
                }
                //endregion
@@ -127,6 +90,30 @@
        }, 10, 10, TimeUnit.SECONDS);
    }

    /**
     * 查询external
     *
     * @param ardEquipExternal external
     * @return external集合
     */
    @Override
    public ArdEquipExternal selectArdEquipExternal(ArdEquipExternal ardEquipExternal) {
        QueryWrapper<ArdEquipExternal> queryWrapper = new QueryWrapper<>(ardEquipExternal);
        return ardEquipExternalMapper.selectOne(queryWrapper);
    }

    /**
     * 按类型列表查询external列表
     *
     * @param types 类型列表
     * @return external
     */
    @Override
    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) {
@@ -148,8 +135,6 @@

        return differentFieldsList;
    }


    //  求两个对象List的差集
    private List<ArdEquipExternal> diffList(List<ArdEquipExternal> oldArrayList, List<ArdEquipExternal> newArrayList) {
        List<ArdEquipExternal> resultList = oldArrayList.stream()
@@ -157,33 +142,4 @@
                .collect(Collectors.toList());
        return resultList;
    }

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

    @Override
    public ArdEquipExternal selectArdEquipExternal(ArdEquipExternal ardEquipExternal) {
        return ardEquipExternalMapper.selectArdEquipExternal(ardEquipExternal);
    }

    /**
     * 查询external列表
     *
     * @param ardEquipExternal external
     * @return external
     */
    @Override
    public List<ArdEquipExternal> selectArdEquipExternalList(ArdEquipExternal ardEquipExternal) {
        return ardEquipExternalMapper.selectArdEquipExternalList(ardEquipExternal);
    }


}