考核指标代码调整

fuliqi

2024-09-09 d5c2dc44df6e6442b3bb5033cd9ca116777aecbc

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

@@ -39,7 +39,7 @@
 */
@Component
@Slf4j
public class CarClockAccuracyCalculation extends IndexCalculationServe implements CalculationStrategy<VehicleDeviceInspectionResult> {
public class CarClockAccuracyCalculation extends IndexCalculationServe<VehicleDeviceInspectionResult, CarClockAccuracyCalculation.AreaStats> implements CalculationStrategy<VehicleDeviceInspectionResult> {
    @Autowired
    private CheckIndexCarMapper checkIndexCarMapper;
    @Autowired
@@ -48,38 +48,16 @@
    private ICheckIndexCarService checkIndexCarService;

    //区域车辆时钟准确性的内部类
    private static class AreaStats {
    protected static class AreaStats {
        int totalSites = 0;
        int accuracySites = 0;
    }

    @Override
    public void calculate(List<VehicleDeviceInspectionResult> list) {
        if (CollectionUtils.isEmpty(list)) {
            log.info("数据为空");
            return;
        }

        //返回以国标码为key的设备map
        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(VehicleDeviceInspectionResult::getExternalIndexCode).collect(Collectors.toList()))
                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
        //获取省厅国标码集合
        List<String> provinceIds = getProvince();

        Map<String, AreaStats> areaStatsMap = new HashMap<>();
        for (VehicleDeviceInspectionResult result : list) {
            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
            if (monitor == null) continue;

            String deptId = monitor.getDeptId().toString();
            updateAreaStats(areaStatsMap, deptId, result);

            // 处理省厅数据
            if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
                String provinceKey = ApiConstants.Province  + deptId;
                updateAreaStats(areaStatsMap, provinceKey, result);
            }
        }
        //获取分区域的指标数量
        Map<String, AreaStats> areaStatsMap = getAreaStatsMap(list);
        if (areaStatsMap == null) return;

        // 查询是否index表已经存在今日数据
        List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
@@ -99,7 +77,8 @@
    /**
     * 累计时钟合格设备
     */
    private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, VehicleDeviceInspectionResult result) {
    @Override
    public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, VehicleDeviceInspectionResult result) {
        //返回对象的引用，如果不存在会放入新的key,value
        AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
        stats.totalSites++;