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/resources/mapper/zgyw/WorkOrderMapper.xml | 2 +-
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 13 ++++++++-----
ycl-server/src/main/java/com/ycl/utils/http/HttpUtils.java | 1 -
3 files changed, 9 insertions(+), 7 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 b9edc3a..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
@@ -758,7 +758,7 @@
@Override
- public String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo) {
+ public synchronized String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo) {
String url = String.format(this.rtspServer + "/api/play/start/%s/%s", deviceId, channelId);
String result = HttpUtils.sendGet(url);
WVPResult wvpResult = JSON.parseObject(result, WVPResult.class);
@@ -770,7 +770,11 @@
System.out.println("鐩爣鍦板潃锛�" + rtspUrl);
FFmpegFrameGrabber grabber = null;
try {
- grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
+ grabber = new FFmpegFrameGrabber(rtspUrl);
+// grabber.setOption("rtsp_transport", "tcp"); // 浣跨敤tcp鐨勬柟寮忥紝涓嶇劧浼氫涪鍖呭緢涓ラ噸
+// grabber.setVideoOption("probesize", "10000"); // 璁剧疆鎹曡幏鍒嗘瀽鐨勬渶澶у瓧鑺�
+ //璁剧疆10s瓒呮椂
+ grabber.setTimeout(10000);
grabber.start();
Frame frame = grabber.grabImage(); // 鐩存帴鎹曡幏涓�甯�
if (frame != null) {
@@ -789,13 +793,12 @@
} else {
System.out.println("鏈崟鑾峰埌甯�");
}
- } catch (Exception e) {
+ } catch (FrameGrabber.Exception e) {
e.printStackTrace();
} finally {
if (grabber != null) {
try {
grabber.stop(); // 鍋滄鎹曡幏
- grabber.release();
} catch (FrameGrabber.Exception e) {
e.printStackTrace();
}
@@ -803,7 +806,7 @@
}
}
} else {
- System.out.println("璇锋眰澶辫触锛岄敊璇爜锛�" + wvpResult.getCode());
+ System.out.println("璇锋眰澶辫触锛岄敊璇爜锛�" + wvpResult.getCode() + "--" + wvpResult.getMsg());
}
System.out.println("鍥剧墖URL锛�" + imgUrl);
return imgUrl;
diff --git a/ycl-server/src/main/java/com/ycl/utils/http/HttpUtils.java b/ycl-server/src/main/java/com/ycl/utils/http/HttpUtils.java
index 676b7b3..e446221 100644
--- a/ycl-server/src/main/java/com/ycl/utils/http/HttpUtils.java
+++ b/ycl-server/src/main/java/com/ycl/utils/http/HttpUtils.java
@@ -64,7 +64,6 @@
log.info("sendGet - {}", urlNameString);
URL realUrl = new URL(urlNameString);
URLConnection connection = realUrl.openConnection();
- connection.setConnectTimeout(20000); // 20s瓒呮椂
connection.setRequestProperty("accept", "*/*");
connection.setRequestProperty("connection", "Keep-Alive");
connection.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)");
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index b9d5398..2f7f2d2 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -63,7 +63,7 @@
AND wo.unit_id = #{query.unitId}
</if>
<if test="query.keyword != null and query.keyword != ''">
- AND (wo.work_order_no like concat('%', #{query.keyword}, '%') or tm.name like concat('%', #{query.keyword}, '%'))
+ AND (wo.work_order_no like concat('%', #{query.keyword}, '%') or tm.name like concat('%', #{query.keyword}, '%') or wo.serial_number like concat('%', #{query.keyword}, '%'))
</if>
<if test="query.status != null and query.status != ''">
AND wo.status = #{query.status}
--
Gitblit v1.8.0