From 3456ced921bf136035047b24702891f8b4f260ba Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 10:40:27 +0800
Subject: [PATCH] 新增工单检测图片表
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 a389e0d..7292182 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
@@ -38,6 +38,7 @@
import com.ycl.utils.http.HttpUtils;
import com.ycl.utils.redis.RedisCache;
import com.ycl.utils.uuid.IdUtils;
+import constant.Constants;
import enumeration.general.NotifyTypeEnum;
import enumeration.general.UrgentLevelEnum;
import enumeration.general.WorkOrderDistributeWayEnum;
@@ -663,35 +664,32 @@
@Override
- public String getFrameImgByDevice(String deviceId, String channelId) throws FFmpegFrameGrabber.Exception {
+ public 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 wvpResult = JSON.parseObject(result, WVPResult.class);
+ String imgUrl = null;
if (wvpResult.getCode() == 0) {
- System.out.println("璇锋眰鎴愬姛");
JSONObject data = (JSONObject) wvpResult.getData();
String rtspUrl = data.getString("fmp4"); // 娉ㄦ剰锛氶�氬父RTSP URL涓嶄細浠�"fmp4"缁撳熬锛岃繖閲屽彲鑳芥槸鐗瑰畾API鐨勮繑鍥炴牸寮�
if (StringUtils.hasText(rtspUrl)) {
System.out.println("鐩爣鍦板潃锛�" + rtspUrl);
-
FFmpegFrameGrabber grabber = null;
try {
grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
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.getUploadPath() + deviceId + IdUtils.fastSimpleUUID() + ".png";
- System.out.println("鍥剧墖鍦板潃锛�" + imgPath);
-
+ String imgPath = PlatformConfig.getUploadPath() + "/" + imgUrl;
+ System.out.println("鍥剧墖淇濆瓨鍦板潃锛�" + imgPath);
+ imgUrl = Constants.RESOURCE_PREFIX + "/" + imgUrl;
// 淇濆瓨鍥剧墖
opencv_imgcodecs.imwrite(imgPath, mat);
} else {
@@ -714,8 +712,8 @@
} else {
System.out.println("璇锋眰澶辫触锛岄敊璇爜锛�" + wvpResult.getCode());
}
-
- return null;
+ System.out.println("鍥剧墖URL锛�" + imgUrl);
+ return imgUrl;
}
@Override
@@ -728,6 +726,7 @@
public void updateImgById(Integer workOrderId, String imgPath) {
new LambdaUpdateChainWrapper<>(baseMapper)
.eq(WorkOrder::getId, workOrderId)
- .set(WorkOrder::getYwCheckResult, imgPath);
+ .set(WorkOrder::getYwCheckResult, imgPath)
+ .update();
}
}
--
Gitblit v1.8.0