fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java
@@ -13,14 +13,13 @@
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
 * @Description
@@ -51,9 +50,12 @@
    private SecCameraService cameraService;
    @Resource
    private BankService bankService;
    @Resource
    private PledgeContractService pledgeContractService;
    @Resource
    private PledgeContractDepotService pledgeContractDepotService;
    @Resource
    private GatewaySerService gatewaySerService;
    /**
     * 获取省及下属市州集合
@@ -132,11 +134,11 @@
        if (null == area) {
            return null;
        }
        List<DicArea> areaChildren =  new ArrayList<>();
        List<DicArea> areaChildren = new ArrayList<>();
        List<DicArea> list = new ArrayList<>();
        if (Constant.AREA_TYPE_1.equals(area.getType())) {
           //查询所有的质押合同
            //查询所有的质押合同
            List<PledgeContract> pledgeContractList = pledgeContractService.listAll(null);
            //查询所有的库区
            List<Dept> depotList = deptService.listDept(null, ContextUtil.getCompanyId(), null);
@@ -150,7 +152,15 @@
            for (Dept dept : depotList) {
                Boolean isPledge = false;
                for (PledgeContract pledgeContract : pledgeContractList) {
                    if( dept.getId().equals(pledgeContract.getPledgeDept())){
                    IgdsBaseParam param = new IgdsBaseParam();
                    param.setParentId(pledgeContract.getId());
                    List<PledgeContractDepot> pledgeContractDepots = pledgeContractDepotService.listAll(param);
                    if (null == pledgeContractDepots || pledgeContractDepots.isEmpty()) {
                        continue;
                    }
                    //找到pledgeContractDepots中的deptId集合,并去重
                    List<String> deptIdList = pledgeContractDepots.stream().map(PledgeContractDepot::getPledgeDept).distinct().collect(Collectors.toList());
                    if (deptIdList.contains(dept.getId())) {
                        //从list中找到当前质押银行的数据
                        DicArea pledgeBank = null;
                        int indexBank = -1;
@@ -161,11 +171,11 @@
                                break;
                            }
                        }
                        if( null == pledgeBank){
                        if (null == pledgeBank) {
                            //未找到质押银行数据则新建
                            pledgeBank = new DicArea();
                            pledgeBank.setCode(pledgeContract.getPledgeBank());
                            pledgeBank.setName("质押银行_"+pledgeContract.getPledgeBank());
                            pledgeBank.setName("质押银行_" + pledgeContract.getPledgeBank());
                            //从银行数据中找到质押银行的信息
                            for (Bank bank : bankList) {
                                if (pledgeContract.getPledgeBank().equals(bank.getId())) {
@@ -184,9 +194,9 @@
                            pledgeBank.getChildren().add(deptDic);
                            //新增质押银行数据到list中
                            areaChildren.add(pledgeBank);
                            isPledge=true;
                            isPledge = true;
                            break;
                        }else{
                        } else {
                            //添加质押银行下的库区数据
                            DicArea deptDic = new DicArea();
                            deptDic.setCode(dept.getId());
@@ -198,16 +208,14 @@
                            }
                            pledgeBank.getChildren().add(deptDic);
                            //更新list中的质押银行数据
                            areaChildren.set(indexBank,pledgeBank);
                            isPledge=true;
                            areaChildren.set(indexBank, pledgeBank);
                            isPledge = true;
                            break;
                        }
                    }
                }
                if(!isPledge){
                if (!isPledge) {
                    DicArea deptDic = new DicArea();
                    deptDic.setCode(dept.getId());
                    deptDic.setName(dept.getKqmc());
@@ -220,7 +228,7 @@
                }
            }
            List<DicArea> defaultBankChildren = defaultBank.getChildren();
            if (defaultBankChildren.size()>0) {
            if (defaultBankChildren.size() > 0) {
                areaChildren.add(defaultBank);
            }
            area.setChildren(areaChildren);
@@ -511,7 +519,11 @@
                        }
                    }
                }
                //判断网关是否在线
                GatewaySer cacheSerByDeptId = gatewaySerService.getCacheSerByDeptId(dept.getId());
                if (null == cacheSerByDeptId || (null != cacheSerByDeptId && StringUtils.isNotBlank(cacheSerByDeptId.getStatus()) && cacheSerByDeptId.getStatus().equals(Constant.YN_N))) {
                    deptData.setDailyTotal(-1);
                }
                list.add(deptData);
            }
        }
@@ -588,7 +600,6 @@
    }
    public GroupGisData getGisDataByCompanyId() {
        GroupGisData groupGisData = new GroupGisData();
@@ -651,6 +662,7 @@
        return groupGisData;
    }
    /**
     * 大屏首页-抓拍跟踪信息
     *
@@ -681,4 +693,53 @@
        return new PageResponse<>(RespCodeEnum.CODE_0000, resultListSnap);
    }
    /**
     * 大屏首页-抓拍跟踪信息-展示AI时间图片
     * 展示图片的业务逻辑:每个库区展示一张,图片为当天十点以后最新的一张
     * @param param
     * @return
     */
    public PageResponse<List<EventInfo>> indexEventInfoList(IgdsBaseParam param) {
//        Date start =DateUtils.setHours(DateUtil.getNewByDay(new Date(), -3), 10);
        //param.setStart(start);
//        param.setEnd(DateUtil.getNewByDay(new Date(), -3));
        Date start =DateUtils.setHours(new Date(), 10);
        param.setStart(start);
        param.setEnd(new Date());
        //获取当日的抓拍信息
        List<EventInfo> listByParam = eventInfoService.getListByParam(param);
        if (null == listByParam || listByParam.isEmpty()) {
            return new PageResponse<>(RespCodeEnum.CODE_0000, new ArrayList<>());
        }
        //筛选time大于Start时间的数据
        listByParam = listByParam.stream().filter(info -> info.getTime().after(start)).collect(Collectors.toList());
        //获取所有的库区信息
        List<Dept> deptList = deptService.getDeptByUserType(null);
        //根据库区从listByParam来获取每一个库区下,最新的一张抓拍图片
        List<EventInfo> resultList = new ArrayList<>();
        for (Dept dept : deptList) {
            EventInfo latestEvent = null;
                //从listByParam中筛选出与当前id匹配的数据
            List<EventInfo> collect = listByParam.stream().filter(info -> info.getDeptId().equals(dept.getId())).collect(Collectors.toList());
            if (!collect.isEmpty()) {
                //根据时间排序并找到最新一条数据
                latestEvent = collect.stream().sorted(Comparator.comparing(EventInfo::getTime).reversed()).findFirst().get();
            }
            if (latestEvent != null) {
                resultList.add(latestEvent);
            }
        }
        if (null != resultList && !resultList.isEmpty()) {
            //判断文件是否存在
            for (EventInfo record : resultList) {
                record.setImgName(commonManager.isImgExit(record.getImgName(), null));
            }
        }
        return new PageResponse<>(RespCodeEnum.CODE_0000, resultList);
    }
}