xiangpei
2024-08-24 34e076739e206cb8721acc4879c380437515a6f5
osd工单检测
4个文件已修改
44 ■■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/UYErrorTypeCheckService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/task/PythonTask.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java
@@ -81,17 +81,17 @@
    /**
     * osd1省
     */
    private Integer osd1Province;
    private String osd1Province;
    /**
     * osd1市
     */
    private Integer osd1City;
    private String osd1City;
    /**
     * osd1区
     */
    private Integer osd1Part;
    private String osd1Part;
    /**
     * osd1 左下角
ycl-server/src/main/java/com/ycl/platform/service/UYErrorTypeCheckService.java
@@ -32,8 +32,19 @@
     */
    void recordMetaDSumCheck(List<RecordMetaDSumResult> dataList);
    /**
     * osd时间偏差
     *
     * @param dataList
     */
    void osdCheck(List<PyOsdResult> dataList);
//    /**
//     * 视频标注
//     */
//    void osdMonitorCheck(List<OsdMonitorResult> dataList);
    /**
     * 海康
     */
}
ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java
@@ -133,6 +133,28 @@
    }
    @Override
    public void osdCheck(List<PyOsdResult> dataList) {
        List<WorkOrder> workOrderList = dataList.stream().map(item -> {
            WorkOrder workOrder = new WorkOrder();
            // osd时间
            if (!item.getCheckTime().equals(item.getSetTime())) {
                this.genWorkOrder(workOrder, ErrorType.CLOCK_SKEW, item.getDeviceNo());
            }
            // osd信息
            if (!"设置正确".equals(item.getOsd1Province())
                    || (!"设置正确".equals(item.getOsd1City()))
                    || (!"设置正确".equals(item.getOsd1Part()))
                    || (!"设置正确".equals(item.getOsd1TimeFormat()))
                    || (!"设置正确".equals(item.getOsd1OSD()))
            ) {
                this.genWorkOrder(workOrder, ErrorType.OSD_ERROR, item.getDeviceNo());
            }
            return workOrder;
        }).collect(Collectors.toList());
        workOrderService.innerAddWorkOrder(workOrderList);
    }
    /**
     * 工单信息
     *
ycl-server/src/main/java/com/ycl/task/PythonTask.java
@@ -8,6 +8,7 @@
import com.ycl.platform.domain.result.UY.*;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.platform.service.IYwThresholdService;
import com.ycl.platform.service.UYErrorTypeCheckService;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
import lombok.extern.slf4j.Slf4j;
@@ -36,6 +37,8 @@
    private MongoTemplate mongoTemplate;
    @Autowired
    private PythonClient pythonClient;
    @Autowired
    private UYErrorTypeCheckService uyErrorTypeCheckService;
    public void pythonOsdTask(){
        log.info("开始执行pythonOsd数据同步");
@@ -58,6 +61,8 @@
                        DeleteResult result = mongoTemplate.remove(pyQuery, PyOsdResult.class);
                        //存放在mongo中
                        mongoTemplate.insertAll(records);
                        // 工单生成
                        uyErrorTypeCheckService.osdCheck(records);
                    }
                } else {
                    log.error("pythonOsd数据为空{}", jsonObject);