Merge branch 'dev'

fuliqi

2025-02-14 c6976365d5bfb39a32db8b541b1fe3ceb30c7826

 ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java

@@ -7,6 +7,7 @@
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexVideoService;
import constant.ApiConstants;
import constant.CheckConstants;
import constant.CheckThreadConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,11 +68,11 @@
            }
        });
        //重点指挥图像特殊处理，统一采用区县数据
        Map<Long, BigDecimal> keyCommandMap = checkIndexVideos.stream().filter(checkIndexVideo -> !checkIndexVideo.getDeptTag() && !checkIndexVideo.getProvinceTag())
        Map<Long, BigDecimal> keyCommandMap = checkIndexVideos.stream().filter(checkIndexVideo -> CheckConstants.Examine_Tag_County.equals(checkIndexVideo.getExamineTag()))
                .collect(Collectors.toMap(checkIndexVideo -> checkIndexVideo.getDeptId(), checkIndexVideo -> checkIndexVideo.getKeyCommandImageOnline()));
        for (CheckIndexVideo checkIndexVideo : checkIndexVideos) {
            //替换省厅和部级 重点指挥图像
            if(checkIndexVideo.getProvinceTag() || checkIndexVideo.getDeptTag()){
            if(CheckConstants.Examine_Tag_Province.equals(checkIndexVideo.getExamineTag()) || CheckConstants.Examine_Tag_Dept.equals(checkIndexVideo.getExamineTag())){
                BigDecimal keyCommand = keyCommandMap.get(checkIndexVideo.getDeptId());
                checkIndexVideo.setKeyCommandImageOnline(keyCommand);
            }