fuliqi
2024-08-15 b3764b100a9e8783e2c061473ada3f5316d84f55
车辆、人脸目录一致率
10个文件已修改
2个文件已添加
339 ■■■■■ 已修改文件
document/海康api.docx 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/constant/CalculationStrategyConstants.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/calculate/CarConsistentCalculation.java 132 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/calculate/FaceConsistentCalculation.java 131 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/mapper/PlatformOnlineMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/task/CarTask.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/task/FaceTask.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/task/VideoTask.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
document/º£¿µapi.docx
Binary files differ
ycl-common/src/main/java/constant/CalculationStrategyConstants.java
@@ -28,7 +28,10 @@
     * è½¦è¾†æ—¶é’Ÿå‡†ç¡®æ€§
     */
    public static final String Car_ClockAccuracy = "carClockAccuracy";
    /**
     * è½¦è¾†ç›®å½•一致率
     */
    public static final String Car_DirectConsistent = "carDirectConsistent";
    /**
     * äººè„¸æ•°æ®ä¸Šä¼ åŠæ—¶æ€§
@@ -50,7 +53,10 @@
     * äººè„¸æ—¶é’Ÿå‡†ç¡®æ€§
     */
    public static final String Face_ClockAccuracy = "faceClockAccuracy";
    /**
     * äººè„¸ç›®å½•一致率
     */
    public static final String Face_DirectConsistent = "faceDirectConsistent";
    /**
     * ä¸€æœºä¸€æ¡£æ³¨å†ŒçŽ‡ã€æ¡£æ¡ˆè€ƒæ ¸æ¯”
ycl-server/src/main/java/com/ycl/calculate/CarConsistentCalculation.java
New file
@@ -0,0 +1,132 @@
package com.ycl.calculate;
import com.alibaba.fastjson2.JSONArray;
import com.ycl.platform.domain.entity.CheckIndexCar;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.result.HK.DataIntegrityMonitoringResult;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexCarMapper;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexCarService;
import constant.ApiConstants;
import constant.CheckConstants;
import constant.RedisConstant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import utils.DateUtils;
import utils.StringUtils;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
 * è®¡ç®—车辆目录一致率
 * èŽ·å–åˆ†çœåŽ…ã€åŒºåŸŸçš„map<k,v> k为deptId或者Province_deptId
 * æ›´æ–°æˆ–新增
 */
@Component
public class CarConsistentCalculation extends IndexCalculationServe implements CalculationStrategy<TMonitorVO> {
    @Autowired
    private CheckIndexCarMapper checkIndexCarMapper;
    @Autowired
    private TMonitorMapper monitorMapper;
    @Autowired
    private ICheckIndexCarService checkIndexCarService;
    @Autowired
    private RedisTemplate redisTemplate;
    //区域车辆信息采集准确率的内部类
    private static class AreaStats {
        int totalSites = 0;
        int newSites = 0;
    }
    @Override
    public void calculate(List<TMonitorVO> list) {
        if (CollectionUtils.isEmpty(list)) {
            return;
        }
        //返回以国标码为key的设备map
        Map<String, TMonitorVO> monitorMap = new HashMap<>();
        if(!CollectionUtils.isEmpty(list)){
            monitorMap = list.stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
        }
        //获取省厅国标码集合
        List<String> provinceIds = getProvince();
        //未注册车辆设备
        Map<String,TMonitor> newMonitorMap = new HashMap<>();
        //Mongo一机一档同步Mysql时放入Redis ç­›é€‰å‡ºè½¦è¾†æ¡£æ¡ˆ
        String json = (String) redisTemplate.opsForValue().get(RedisConstant.New_Monitor_Set);
        if (!StringUtils.isEmpty(json)) {
            List<TMonitor> newMonitors = JSONArray.parseArray(json, TMonitor.class);
            if(!CollectionUtils.isEmpty(newMonitors)){
                newMonitorMap = newMonitors.stream().filter(tMonitor -> tMonitor.getCameraFunType().contains(CheckConstants.Rule_Category_Car+"")).collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
            }
        }
        Map<String, AreaStats> areaStatsMap = new HashMap<>();
        for (TMonitorVO result : list) {
            TMonitorVO monitor = monitorMap.get(result.getSerialNumber());
            if (monitor == null) continue;
            String deptId = monitor.getDeptId().toString();
            updateAreaStats(areaStatsMap, deptId, result,newMonitorMap);
            // å¤„理省厅数据
            if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
                String provinceKey = ApiConstants.Province + deptId;
                updateAreaStats(areaStatsMap, provinceKey, result,newMonitorMap);
            }
        }
        // æŸ¥è¯¢æ˜¯å¦index表已经存在今日数据
        List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
        List<CheckIndexCar> checkIndexCars = new ArrayList<>();
        areaStatsMap.forEach((deptId, stats) -> {
            if (stats.totalSites > 0) {
                CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, checkIndexCarList);
                if (checkIndexCar != null) {
                    checkIndexCars.add(checkIndexCar);
                }
            }
        });
        checkIndexCarService.saveOrUpdateBatch(checkIndexCars);
    }
    /**
     * ç´¯è®¡è½¦è¾†ç›®å½•一致率
     */
    private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, TMonitorVO result,Map<String,TMonitor> newMonitorMap) {
        //返回对象的引用,如果不存在会放入新的key,value
        AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
        stats.totalSites++;
        if(newMonitorMap.containsKey(result.getSerialNumber())){
            stats.newSites++;
        }
    }
    /**
     * è½¦è¾†ä¿¡æ¯é‡‡é›†æ­£ç¡®çއ
     */
    private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
        CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
        if (checkIndexCar == null) {
            return null;
        }
        //调用目录一致率计算方法
        Map<String, Object> param = new HashMap<>();
        param.put("totalSites", stats.totalSites);
        param.put("newSites", stats.newSites);
        BigDecimal directoryConstant = directoryConstant(param);
        checkIndexCar.setDeviceDirectoryConsistent(directoryConstant);
        return checkIndexCar;
    }
}
ycl-server/src/main/java/com/ycl/calculate/FaceConsistentCalculation.java
New file
@@ -0,0 +1,131 @@
package com.ycl.calculate;
import com.alibaba.fastjson2.JSONArray;
import com.ycl.platform.domain.entity.CheckIndexFace;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexFaceMapper;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexFaceService;
import constant.ApiConstants;
import constant.CheckConstants;
import constant.RedisConstant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import utils.DateUtils;
import utils.StringUtils;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
 * è®¡ç®—车辆目录一致率
 * èŽ·å–åˆ†çœåŽ…ã€åŒºåŸŸçš„map<k,v> k为deptId或者Province_deptId
 * æ›´æ–°æˆ–新增
 */
@Component
public class FaceConsistentCalculation extends IndexCalculationServe implements CalculationStrategy<TMonitorVO> {
    @Autowired
    private CheckIndexFaceMapper checkIndexFaceMapper;
    @Autowired
    private TMonitorMapper monitorMapper;
    @Autowired
    private ICheckIndexFaceService checkIndexFaceService;
    @Autowired
    private RedisTemplate redisTemplate;
    //区域车辆信息采集准确率的内部类
    private static class AreaStats {
        int totalSites = 0;
        int newSites = 0;
    }
    @Override
    public void calculate(List<TMonitorVO> list) {
        if (CollectionUtils.isEmpty(list)) {
            return;
        }
        //返回以国标码为key的设备map
        Map<String, TMonitorVO> monitorMap = new HashMap<>();
        if(!CollectionUtils.isEmpty(list)){
            monitorMap = list.stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
        }
        //获取省厅国标码集合
        List<String> provinceIds = getProvince();
        //未注册车辆设备
        Map<String,TMonitor> newMonitorMap = new HashMap<>();
        //Mongo一机一档同步Mysql时放入Redis ç­›é€‰å‡ºè½¦è¾†æ¡£æ¡ˆ
        String json = (String) redisTemplate.opsForValue().get(RedisConstant.New_Monitor_Set);
        if (!StringUtils.isEmpty(json)) {
            List<TMonitor> newMonitors = JSONArray.parseArray(json, TMonitor.class);
            if(!CollectionUtils.isEmpty(newMonitors)){
                newMonitorMap = newMonitors.stream().filter(tMonitor -> tMonitor.getCameraFunType().contains(CheckConstants.Rule_Category_Face+"")).collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
            }
        }
        Map<String, AreaStats> areaStatsMap = new HashMap<>();
        for (TMonitorVO result : list) {
            TMonitorVO monitor = monitorMap.get(result.getSerialNumber());
            if (monitor == null) continue;
            String deptId = monitor.getDeptId().toString();
            updateAreaStats(areaStatsMap, deptId, result,newMonitorMap);
            // å¤„理省厅数据
            if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
                String provinceKey = ApiConstants.Province + deptId;
                updateAreaStats(areaStatsMap, provinceKey, result,newMonitorMap);
            }
        }
        // æŸ¥è¯¢æ˜¯å¦index表已经存在今日数据
        List<CheckIndexFace> checkIndexFaceList = checkIndexFaceMapper.selectToday(DateUtils.getDate());
        List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
        areaStatsMap.forEach((deptId, stats) -> {
            if (stats.totalSites > 0) {
                CheckIndexFace checkIndexFace = createOrUpdateCheckIndexFace(deptId, stats, checkIndexFaceList);
                if (checkIndexFace != null) {
                    checkIndexFaces.add(checkIndexFace);
                }
            }
        });
        checkIndexFaceService.saveOrUpdateBatch(checkIndexFaces);
    }
    /**
     * ç´¯è®¡äººè„¸ç›®å½•一致率
     */
    private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, TMonitorVO result,Map<String,TMonitor> newMonitorMap) {
        //返回对象的引用,如果不存在会放入新的key,value
        AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
        stats.totalSites++;
        if(newMonitorMap.containsKey(result.getSerialNumber())){
            stats.newSites++;
        }
    }
    /**
     * äººè„¸ä¿¡æ¯é‡‡é›†æ­£ç¡®çއ
     */
    private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexFace> checkIndexFaceList) {
        CheckIndexFace checkIndexFace = getCheckIndex(key, checkIndexFaceList, CheckIndexFace.class);
        if (checkIndexFace == null) {
            return null;
        }
        //调用目录一致率计算方法
        Map<String, Object> param = new HashMap<>();
        param.put("totalSites", stats.totalSites);
        param.put("newSites", stats.newSites);
        BigDecimal directoryConstant = directoryConstant(param);
        checkIndexFace.setDeviceDirectoryConsistent(directoryConstant);
        return checkIndexFace;
    }
}
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -67,6 +67,18 @@
        return onlineSites.divide(totalSites, 4, RoundingMode.HALF_UP);
    }
    //目录一致率,每超过百分之1扣10%
    public BigDecimal directoryConstant(Map<String, Object> param) {
        BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
        BigDecimal newSites = new BigDecimal((Integer) param.get("newSites"));
        // è®¡ç®—newSites占totalSites的百分比倍数
        BigDecimal percentage = newSites.divide(totalSites, 2, RoundingMode.DOWN).multiply(BigDecimal.valueOf(100));
        BigDecimal result = BigDecimal.ONE;
        if(BigDecimal.ONE.compareTo(percentage) <= 0 ){
            result = result.subtract(percentage.multiply(new BigDecimal("0.1")));
        }
        return result.max(BigDecimal.ZERO);
    }
    //视图库对接稳定性
    public BigDecimal viewConnectStability(Map<String, Object> param) {
        BigDecimal totalDataSum = new BigDecimal((Integer) param.get("totalDataSum"));
ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
@@ -33,8 +33,6 @@
    @Autowired
    private CheckIndexVideoMapper checkIndexVideoMapper;
    @Autowired
    private TMonitorMapper monitorMapper;
    @Autowired
    private ICheckIndexVideoService checkIndexVideoService;
    @Autowired
    private RedisTemplate redisTemplate;
@@ -61,6 +59,8 @@
        if(!CollectionUtils.isEmpty(list)){
            monitorMap = list.stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
        }
        //获取省厅国标码集合
        List<String> provinceIds = getProvince();
        //未注册设备
        Map<String,TMonitor> newMonitorMap = new HashMap<>();
        //Mongo一机一档同步Mysql时放入Redis
@@ -81,7 +81,11 @@
            String deptId = monitor.getDeptId().toString();
            updateAreaStats(areaStatsMap, deptId, result,newMonitorMap,todayMonitor);
            // å¤„理省厅数据
            if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
                String provinceKey = ApiConstants.Province + deptId;
                updateAreaStats(areaStatsMap, provinceKey, result,newMonitorMap,todayMonitor);
            }
        }
        // æŸ¥è¯¢æ˜¯å¦index表已经存在今日数据
ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java
@@ -23,7 +23,8 @@
        calculators.put(CalculationStrategyConstants.Car_DataAccuracy_Url_PicUsability, new CarDeviceSampleCalculation());
        //车辆时钟准确性
        calculators.put(CalculationStrategyConstants.Car_ClockAccuracy, new CarClockAccuracyCalculation());
        //TODO:车辆目录一致
        //车辆目录一致
        calculators.put(CalculationStrategyConstants.Car_DirectConsistent, new CarConsistentCalculation());
        //人脸点位在线、视图库对接稳定
        calculators.put(CalculationStrategyConstants.Face_SiteOnline_ViewStability, new FaceSnapshotDataCalculation());
@@ -35,7 +36,8 @@
        calculators.put(CalculationStrategyConstants.Face_DataAccuracy_PicUsability, new FaceDeviceSampleCalculation());
        //人脸时钟准确性
        calculators.put(CalculationStrategyConstants.Face_ClockAccuracy, new FaceClockAccuracyCalculation());
        //TODO:人脸目录一致
        //人脸目录一致
        calculators.put(CalculationStrategyConstants.Face_DirectConsistent, new FaceConsistentCalculation());
        //一机一档注册率、档案考核比
        calculators.put(CalculationStrategyConstants.Video_MonitorRegis_ArchiveRate,new MonitorRegistrationCalculation())
ycl-server/src/main/java/com/ycl/platform/mapper/PlatformOnlineMapper.java
@@ -34,6 +34,6 @@
    IPage getPage(IPage page, @Param("query") DataCenterQuery query);
    //昨日数据
    List<PlatformOnlineVO> sumYesterday(@Param("startDate")String startDate, @Param("endDate")String endDate);
    List<PlatformOnlineVO> yesterdayData(@Param("startDate")String startDate, @Param("endDate")String endDate);
}
ycl-server/src/main/java/com/ycl/task/CarTask.java
@@ -4,9 +4,12 @@
import com.ycl.calculate.CalculationStrategy;
import com.ycl.factory.IndexCalculationFactory;
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
import constant.CalculationStrategyConstants;
import constant.CheckConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
@@ -16,6 +19,7 @@
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
 * è½¦è¾†è®¡ç®—考核指标任务
@@ -26,7 +30,8 @@
public class CarTask {
    @Autowired
    private MongoTemplate mongoTemplate;
    @Autowired
    private TMonitorMapper monitorMapper;
    public void siteOnlineTask() {
        Date yesterday = DateUtils.addDays(new Date(), -1);
        //计算点位在线率和视图库对接稳定性
@@ -95,8 +100,12 @@
        calculator.calculate(results);
    }
    public void test() {
        Date yesterday = DateUtils.addDays(new Date(), -1);
        //TODO:一机一档 è”网卡口设备目录一致率
    public void directConsistentTask() {
        //车辆目录一致率
        List<TMonitorVO> tMonitorVOS = monitorMapper.selectMonitorVOList();
        List<TMonitorVO> list = tMonitorVOS.stream().filter(tMonitorVO -> tMonitorVO.getCameraFunType().contains(CheckConstants.Rule_Category_Car + "")).collect(Collectors.toList());
        CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Car_DirectConsistent);
        calculator.calculate(list);
    }
}
ycl-server/src/main/java/com/ycl/task/FaceTask.java
@@ -4,9 +4,12 @@
import com.ycl.calculate.CalculationStrategy;
import com.ycl.factory.IndexCalculationFactory;
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
import constant.CalculationStrategyConstants;
import constant.CheckConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
@@ -16,6 +19,7 @@
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
 * äººè„¸è®¡ç®—考核指标任务
@@ -26,6 +30,8 @@
public class FaceTask {
    @Autowired
    private MongoTemplate mongoTemplate;
    @Autowired
    private TMonitorMapper monitorMapper;
    public void siteOnlineTask() {
        Date yesterday = DateUtils.addDays(new Date(), -1);
@@ -80,8 +86,11 @@
        calculator.calculate(results);
    }
    public void test() {
        Date yesterday = DateUtils.addDays(new Date(), -1);
        //TODO:一机一档 è”网卡口设备目录一致率
    public void directConsistentTask() {
        //人脸目录一致率
        List<TMonitorVO> tMonitorVOS = monitorMapper.selectMonitorVOList();
        List<TMonitorVO> list = tMonitorVOS.stream().filter(tMonitorVO -> tMonitorVO.getCameraFunType().contains(CheckConstants.Rule_Category_Face + "")).collect(Collectors.toList());
        CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_DirectConsistent);
        calculator.calculate(list);
    }
}
ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -91,7 +91,7 @@
    }
    public void platformOnlineTask() {
        //计算平台在线率
        List<PlatformOnlineVO> list = platformOnlineMapper.sumYesterday(DateUtils.getMouthStart(new Date()), DateUtils.getMouthEnd(new Date()));
        List<PlatformOnlineVO> list = platformOnlineMapper.yesterdayData(DateUtils.getMouthStart(new Date()), DateUtils.getMouthEnd(new Date()));
        CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_PlatformOnline);
        calculator.calculate(list);
    }
ycl-server/src/main/resources/mapper/zgyw/PlatformOnlineMapper.xml
@@ -47,7 +47,7 @@
    </select>
    <select id="sumYesterday" resultMap="BaseResultMap">
    <select id="yesterdayData" resultMap="BaseResultMap">
        select * from t_platform_online
        where create_date between #{startDate} and #{endDate}
    </select>