From 96dedce954166293315445ff09864d1d8958e9dc Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 19 九月 2024 18:57:45 +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/task/WorkOrderImgTask.java | 34 ++++++++---------
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 61 ++++++++++++++++++++++++++++++
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 12 +++++
4 files changed, 89 insertions(+), 20 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
index e968d6d..881aa00 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -191,7 +191,17 @@
String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo);
/**
- * 鏌ヨ宸ュ崟锛氬凡涓嬪彂銆佸凡澶勭悊銆佸凡瀹屾垚鐨勫伐鍗�
+ * 宸ュ崟璁惧鐐规挱鑾峰彇涓�甯у浘鐗囷紝骞朵繚瀛樺埌鏁版嵁搴�
+ *
+ * @param deviceId 鍥芥爣璁惧鍥芥爣鐮�
+ * @param channelId 璁惧閫氶亾缂栧彿锛堣澶囧浗鏍囩爜锛�
+ * @param workOrderNo 宸ュ崟鍙�
+ * @return 鏁版嵁
+ */
+ void saveFrameImgByDevice(String deviceId, String channelId, String workOrderNo);
+
+ /**
+ * 鏌ヨ宸ュ崟锛氬緟瀹℃牳鐨勫伐鍗�
*
* @param start 寮�濮嬫椂闂�
* @param end 缁撴潫鏃堕棿
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 4d94f52..b89867f 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
@@ -725,6 +725,67 @@
}
@Override
+ public void saveFrameImgByDevice(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);
+ String imgUrl = null;
+ if (wvpResult.getCode() == 0) {
+ JSONObject data = (JSONObject) wvpResult.getData();
+ String rtspUrl = data.getString("fmp4"); // 鍙杕p4鍦板潃
+ if (StringUtils.hasText(rtspUrl)) {
+ System.out.println("鐩爣鍦板潃锛�" + rtspUrl);
+ FFmpegFrameGrabber grabber = null;
+ try {
+ grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
+ //璁剧疆10s瓒呮椂
+ grabber.setTimeout(10000);
+ grabber.start();
+ Frame frame = grabber.grabImage(); // 鐩存帴鎹曡幏涓�甯�
+ if (frame != null) {
+ System.out.println("鎴愬姛鎹曡幏涓�甯�");
+ // 灏咶rame杞崲涓篗at
+ OpenCVFrameConverter.ToMat converter = new OpenCVFrameConverter.ToMat();
+ Mat mat = converter.convertToMat(frame);
+
+ imgUrl = workOrderNo + "_" + IdUtils.fastSimpleUUID() + ".png";
+ // 鐢熸垚鍥剧墖璺緞
+ String imgPath = PlatformConfig.getProfile() + "/" + imgUrl;
+ System.out.println("鍥剧墖淇濆瓨鍦板潃锛�" + imgPath);
+ imgUrl = Constants.RESOURCE_PREFIX + "/" + imgUrl;
+ // 淇濆瓨鍥剧墖
+ opencv_imgcodecs.imwrite(imgPath, mat);
+ } else {
+ System.out.println("鏈崟鑾峰埌甯�");
+ }
+ } catch (FrameGrabber.Exception e) {
+ e.printStackTrace();
+ } finally {
+ if (grabber != null) {
+ try {
+ grabber.stop(); // 鍋滄鎹曡幏
+ } catch (FrameGrabber.Exception e) {
+ e.printStackTrace();
+ }
+ // 閫氬父涓嶉渶瑕佽皟鐢╮elease()锛屽洜涓簊top()浼氬鐞嗚祫婧愰噴鏀�
+ // grabber.release(); // 閲婃斁璧勬簮
+ }
+ }
+ }
+ } else {
+ System.out.println("璇锋眰澶辫触锛岄敊璇爜锛�" + wvpResult.getCode());
+ }
+ System.out.println("鍥剧墖URL锛�" + imgUrl);
+ if (StringUtils.hasText(imgUrl)) {
+ WorkOrderCheckImg img = new WorkOrderCheckImg();
+ img.setWorkOrderNo(workOrderNo);
+ img.setImgUrl(imgUrl);
+ img.setCreateTime(new Date());
+ workOrderCheckImgMapper.insert(img);
+ }
+ }
+
+ @Override
public List<DeviceInfoVO> hasErrorWorkOrderList(Date start, Date end) {
List<DeviceInfoVO> list = baseMapper.hasErrorWorkOrderList(start, end);
return list;
diff --git a/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java b/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
index 8adb134..80a32cc 100644
--- a/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
@@ -39,13 +39,13 @@
private final DeviceInfoMapper deviceInfoMapper;
private final WorkOrderCheckImgMapper workOrderCheckImgMapper;
- private static final ExecutorService executorService = new ThreadPoolExecutor(16,
- 128,
- 5000,
- TimeUnit.SECONDS,
- new ArrayBlockingQueue<>(1000),
- new ThreadPoolExecutor.CallerRunsPolicy()
- );
+// private static final ExecutorService executorService = new ThreadPoolExecutor(8,
+// 10,
+// 5000,
+// TimeUnit.SECONDS,
+// new ArrayBlockingQueue<>(1024),
+// new ThreadPoolExecutor.CallerRunsPolicy()
+// );
public void run() {
// 鏌ュ嚭鏈�杩戜竴鍛ㄧ殑鏁呴殰鐨勮澶�
@@ -66,17 +66,15 @@
return;
}
for (DeviceInfoVO deviceInfo : deviceList) {
- executorService.submit(() -> {
- // 鍥芥爣璁惧鐨勭紪鐮佸氨鏄彇瑙嗛娴佺殑璁惧缂栫爜锛屽浗鏍囪澶囧氨涓�涓�傚浗鏍囪澶囩殑姣忎竴涓�氶亾浠ｈ〃涓�涓憚鍍忓ご锛屼篃灏辨槸璁惧id鏄彇娴佺殑閫氶亾id
- String frameImg = workOrderService.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), deviceInfo.getDeviceId(), deviceInfo.getWorkOrderNo());
- if (StringUtils.hasText(frameImg)) {
- WorkOrderCheckImg img = new WorkOrderCheckImg();
- img.setWorkOrderNo(deviceInfo.getWorkOrderNo());
- img.setImgUrl(frameImg);
- img.setCreateTime(new Date());
- workOrderCheckImgMapper.insert(img);
- }
- });
+ // 鍥芥爣璁惧鐨勭紪鐮佸氨鏄彇瑙嗛娴佺殑璁惧缂栫爜锛屽浗鏍囪澶囧氨涓�涓�傚浗鏍囪澶囩殑姣忎竴涓�氶亾浠ｈ〃涓�涓憚鍍忓ご锛屼篃灏辨槸璁惧id鏄彇娴佺殑閫氶亾id
+ String frameImg = workOrderService.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), deviceInfo.getDeviceId(), deviceInfo.getWorkOrderNo());
+ if (StringUtils.hasText(frameImg)) {
+ WorkOrderCheckImg img = new WorkOrderCheckImg();
+ img.setWorkOrderNo(deviceInfo.getWorkOrderNo());
+ img.setImgUrl(frameImg);
+ img.setCreateTime(new Date());
+ workOrderCheckImgMapper.insert(img);
+ }
}
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 91f4943..b650439 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -238,7 +238,7 @@
FROM
t_work_order wo
WHERE
- wo.create_time BETWEEN #{start} AND #{end}
+ wo.create_time BETWEEN #{start} AND #{end} AND wo.status = 'AUDITING'
AND deleted = 0
</select>
--
Gitblit v1.8.0