From b571b243fe34b63ced919cbf7c56da0e48dbdac4 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 30 九月 2024 00:38:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java index 5b5e8ce..8698a12 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java +++ b/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(); @@ -759,7 +765,7 @@ String imgUrl = null; if (wvpResult.getCode() == 0) { JSONObject data = (JSONObject) wvpResult.getData(); - String rtspUrl = data.getString("mp4"); // 鍙杕p4鍦板潃 + String rtspUrl = data.getString("fmp4"); // 鍙杕p4鍦板潃 if (StringUtils.hasText(rtspUrl)) { System.out.println("鐩爣鍦板潃锛�" + rtspUrl); FFmpegFrameGrabber grabber = null; -- Gitblit v1.8.0