下发工单bug

fuliqi

2024-09-30 3351ade035a3a027d38e0372e496a5669cd7bde2

下发工单bug

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DistributeWorkOrderVO.java

@@ -10,6 +10,7 @@
import lombok.experimental.Accessors;

import java.time.LocalDateTime;
import java.util.List;

/**
 * 下发工单查询
@@ -52,7 +53,7 @@
    private LocalDateTime  end;

    @NotNull(message = "请选择故障类型")
    private String errorType;
    private List<String> errorType;

}


 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java

@@ -56,6 +56,11 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -559,7 +564,7 @@
                .select(WorkOrder::getSerialNumber, WorkOrder::getWorkOrderNo)
                .eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
                .eq(Objects.nonNull(data.getUnitId()), WorkOrder::getUnitId, data.getUnitId())
                .eq(WorkOrder::getErrorType, data.getErrorType())
                .in(WorkOrder::getErrorType, data.getErrorType())
                .between(WorkOrder::getCreateTime, data.getStart(), data.getEnd())
                .orderByDesc(WorkOrder::getCreateTime)
                .last("limit " + data.getFastNumLimit())
@@ -621,6 +626,7 @@
            ywPointService.updateRecovery(serialNumberList, 1);
            return Result.ok("成功下发" + query.getWorkOrderNOList().size() + "条工单");
        } catch (Exception e) {
            System.out.println(e.getMessage());
            return Result.error("操作失败");
        } finally {
            distributeUnLock();
@@ -765,8 +771,6 @@
                FFmpegFrameGrabber grabber = null;
                try {
                    grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
                    //设置10s超时
                    grabber.setTimeout(10000);
                    grabber.start();
                    Frame frame = grabber.grabImage(); // 直接捕获一帧
                    if (frame != null) {
@@ -785,17 +789,16 @@
                    } else {
                        System.out.println("未捕获到帧");
                    }
                } catch (FrameGrabber.Exception e) {
                } catch (Exception e) {
                    e.printStackTrace();
                } finally {
                    if (grabber != null) {
                        try {
                            grabber.stop(); // 停止捕获
                            grabber.release();
                        } catch (FrameGrabber.Exception e) {
                            e.printStackTrace();
                        }
                        // 通常不需要调用release()，因为stop()会处理资源释放
                        // grabber.release(); // 释放资源
                    }
                }
            }

 ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java

@@ -25,8 +25,6 @@

@Slf4j
@Component("checkScoreTask")
//TODO:增加考核标签字典：公安部
//TODO:修改点位状态字典：在线、离线
//TODO：修改score、index默认发布
public class CheckScoreTask {
    @Autowired

 ycl-server/src/main/java/com/ycl/task/UYTask.java

@@ -273,41 +273,41 @@
    public void recordMetaDSumTask() {
        //录像可用率
        log.info("开始执行录像可用数据同步");
        RecordMetaDSumParam param = new RecordMetaDSumParam();
        param.setTenantId(tenantId);
        Calendar instance = Calendar.getInstance();
        instance.setTime(new Date());
        instance.add(Calendar.DAY_OF_MONTH, -1);
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
        String yesterday = format.format(instance.getTime());
        param.setStatTime(yesterday);
        JSONObject jsonObject = uyClient.recordMetaDSumList(param);
        if (jsonObject != null) {
            if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
                List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class);
                if (!CollectionUtils.isEmpty(records)) {
                    //如果今天存在之前的数据先删除
                    Query query = new Query(Criteria
                            .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
                    DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class);
                    records.stream().forEach(item -> {
                        if (Objects.nonNull(item.getDeviceId())) {
                            item.setNo(item.getDeviceId());
                        }
                    });
                    pointService.setDeviceTagByGB(records);
                    //存放在mongo中
                    mongoTemplate.insertAll(records);
                    // 工单生成
                    uyErrorTypeCheckService.recordMetaDSumCheck(records);
                }
            } else {
                log.error("录像可用数据为空{}", jsonObject);
            }
        }
        // 本地测试
//        Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
//        uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
//        RecordMetaDSumParam param = new RecordMetaDSumParam();
//        param.setTenantId(tenantId);
//        Calendar instance = Calendar.getInstance();
//        instance.setTime(new Date());
//        instance.add(Calendar.DAY_OF_MONTH, -1);
//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
//        String yesterday = format.format(instance.getTime());
//        param.setStatTime(yesterday);
//        JSONObject jsonObject = uyClient.recordMetaDSumList(param);
//        if (jsonObject != null) {
//            if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
//                List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class);
//                if (!CollectionUtils.isEmpty(records)) {
//                    //如果今天存在之前的数据先删除
//                    Query query = new Query(Criteria
//                            .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
//                    DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class);
//                    records.stream().forEach(item -> {
//                        if (Objects.nonNull(item.getDeviceId())) {
//                            item.setNo(item.getDeviceId());
//                        }
//                    });
//                    pointService.setDeviceTagByGB(records);
//                    //存放在mongo中
//                    mongoTemplate.insertAll(records);
//                    // 工单生成
//                    uyErrorTypeCheckService.recordMetaDSumCheck(records);
//                }
//            } else {
//                log.error("录像可用数据为空{}", jsonObject);
//            }
//        }
//         本地测试
        Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
        uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
        log.info("结束执行录像可用数据同步");
    }