修复bug

‘liusuyi’

2023-11-29 2574db703fa175765394dba9d4e0d623a1bcd16a

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

@@ -1,48 +1,147 @@
package com.ard.alarm.external.service.impl;

import java.util.List;
import java.util.*;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
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.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;


/**
 * externalService业务层处理
 * 
 *
 * @author zj
 * @date 2023-03-13
 */
@Service
public class ArdEquipExternalServiceImpl implements IArdEquipExternalService
{
    @Autowired
@Slf4j(topic = "external")
@Order(5)
public class ArdEquipExternalServiceImpl implements IArdEquipExternalService, ApplicationRunner {

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

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

    @Override
    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();
    }

    /**
     * 同步任务
     * 刘苏义
     * 2023/8/11 9:09:27
     */
    private void syncTask() {
        scheduler.scheduleAtFixedRate(() -> {
            try {
                //region 定时同步外联设备
                List<String> targetTypes = Arrays.asList("1", "5", "6");
                List<ArdEquipExternal> ardEquipExternalsNew = selectArdEquipExternalListByTypes(targetTypes);
                //需要更新的数据
                List<ArdEquipExternal> updateList = sameListWithDifferent(ardEquipExternalList, ardEquipExternalsNew);
                if (updateList.size() > 0) {
                    HikClientUtil.logoutAllArdEquipExternals(updateList);
                    HikClientUtil.loginAllArdEquipExternals(updateList);
                    ardEquipExternalList.clear();
                    ardEquipExternalList.addAll(ardEquipExternalsNew);
                }
                //需要删除的数据
                List<ArdEquipExternal> delList = diffList(ardEquipExternalList, ardEquipExternalsNew);
                if (delList.size() > 0) {
                    HikClientUtil.logoutAllArdEquipExternals(delList);
                    for (ArdEquipExternal ardEquipExternal : delList) {
                        ardEquipExternalList.remove(ardEquipExternal);
                    }
                }
                //需要新增的数据
                List<ArdEquipExternal> inserList = diffList(ardEquipExternalsNew, ardEquipExternalList);
                if (inserList.size() > 0) {
                    HikClientUtil.loginAllArdEquipExternals(inserList);
                    for (ArdEquipExternal ardEquipExternal : inserList) {
                        ardEquipExternalList.add(ardEquipExternal);
                    }
                }
                //endregion
            } catch (Exception e) {
                log.error("同步外联任务执行出错" + e.getMessage());
            }
        }, 10, 10, TimeUnit.SECONDS);
    }

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

    /**
     * 查询external列表
     * 
     * @param ardEquipExternal external
     * 按类型列表查询external列表
     *
     * @param types 类型列表
     * @return external
     */
    @Override
    public List<ArdEquipExternal> selectArdEquipExternalList(ArdEquipExternal ardEquipExternal)
    {
        return ardEquipExternalMapper.selectArdEquipExternalList(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) {
        List<ArdEquipExternal> differentFieldsList = newList.stream()
                .filter(newItem -> {
                    ArdEquipExternal oldItem = oldList.stream()
                            .filter(item -> item.getId().equals(newItem.getId()))
                            .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());
                })
                .collect(Collectors.toList());

        return differentFieldsList;
    }
    //  求两个对象List的差集
    private List<ArdEquipExternal> diffList(List<ArdEquipExternal> oldArrayList, List<ArdEquipExternal> newArrayList) {
        List<ArdEquipExternal> resultList = oldArrayList.stream()
                .filter(item -> !newArrayList.stream().map(e -> e.getId()).collect(Collectors.toList()).contains(item.getId()))
                .collect(Collectors.toList());
        return resultList;
    }
}