工单过程图接口更换

xiangpei

2024-08-29 3e9a6da99aae968123ee7bca352fc08becd7f1f2

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

@@ -1,8 +1,7 @@
package com.ycl.calculate;

import com.ycl.platform.domain.entity.CheckIndexVideo;
import com.ycl.platform.domain.result.UY.PyOsdResult;
import com.ycl.platform.domain.result.UY.VideoOnlineResult;
import com.ycl.platform.domain.result.UY.OsdCheckResult;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexVideoMapper;
import com.ycl.platform.mapper.TMonitorMapper;
@@ -32,7 +31,7 @@
 */
@Component
@Slf4j
public class VideoOsdCalculation extends IndexCalculationServe implements CalculationStrategy<PyOsdResult> {
public class VideoOsdCalculation extends IndexCalculationServe implements CalculationStrategy<OsdCheckResult> {
    @Autowired
    private CheckIndexVideoMapper checkIndexVideoMapper;
    @Autowired
@@ -52,14 +51,14 @@
    }

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

        //获得国标码为key的设备map
        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(PyOsdResult::getDeviceNo).collect(Collectors.toList()))
        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(OsdCheckResult::getDeviceNo).collect(Collectors.toList()))
                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
        //获取省厅国标码集合
        List<String> provinceIds = getProvince();
@@ -67,7 +66,7 @@
        List<String> important = getImportant();

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

@@ -99,7 +98,7 @@
    /**
     * 累计osd合格数、时间偏差合格数
     */
    private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, PyOsdResult result, List<String> important) {
    private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, OsdCheckResult result, List<String> important) {
        //返回对象的引用，如果不存在会放入新的key,value
        AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
        stats.totalSites++;
@@ -123,27 +122,16 @@
        }
    }

    private Boolean checkOsd(PyOsdResult result) {
        return ApiConstants.PY_OSD_Correct.equals(result.getOsd1Province()) &&
                ApiConstants.PY_OSD_Correct.equals(result.getOsd1City()) &&
                ApiConstants.PY_OSD_Correct.equals(result.getOsd1Part()) &&
                ApiConstants.PY_OSD_Correct.equals(result.getOsd1LB()) &&
                ApiConstants.PY_OSD_Correct.equals(result.getOsd1OSD()) &&
                ApiConstants.PY_OSD_Correct.equals(result.getOsd1TimeFormat()) &&
                ApiConstants.PY_OSD_Correct.equals(result.getOsd1OsdSet());
    private Boolean checkOsd(OsdCheckResult result) {
        return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect()) &&
                ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect()) &&
                ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect()) &&
                ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect()) &&
                ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect());
    }

    private Boolean checkTime(PyOsdResult result) {
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        // 解析时间字符串
        LocalDateTime checkTime = LocalDateTime.parse(result.getCheckTime(), formatter);
        LocalDateTime osdTime = LocalDateTime.parse(result.getSetTime(), formatter);
        // 计算时间差（Duration）
        Duration duration = Duration.between(checkTime, osdTime);
        // 将时间差转换为秒
        long secondsBetween = duration.getSeconds();
        // 判断时间差是否在60秒以内
        return secondsBetween <= 60;
    private Boolean checkTime(OsdCheckResult result) {
        return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect());
    }

    /**