From d268f82d25c25ebdc7a1ea30614f6cda6d3a9ae3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 10 十月 2024 16:31:41 +0800
Subject: [PATCH] win库+大屏考核指标查询bug

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java |   84 +++++++++++++++++++----------------------
 1 files changed, 39 insertions(+), 45 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 a1bbc45..dad7b84 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,7 +56,10 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import javax.imageio.ImageIO;
 import javax.swing.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -760,39 +763,28 @@
 
 
     @Override
-    public synchronized String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo) {
+    public synchronized String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo) throws Exception {
         String url = String.format(this.rtspServer + "/api/play/start/%s/%s", deviceId, channelId);
         String result = HttpUtils.sendGet(url);
-        log.error("鎷垮埌鍙栨祦鍝嶅簲缁撴灉锛�" + result);
+        log.info("鎷垮埌鍙栨祦鍝嶅簲缁撴灉锛�" + result);
         WVPResult wvpResult = JSON.parseObject(result, WVPResult.class);
         String imgUrl = null;
-        if (0 == wvpResult.getCode()) {
-            log.error("璇锋眰鎴愬姛");
+        if (wvpResult.getCode() == 0) {
             JSONObject data = (JSONObject) wvpResult.getData();
-            String rtspUrl = data.getString("rtsp"); // 鍙栧湴鍧�
-            log.error("鐩爣鍦板潃锛�" + rtspUrl);
+            String rtspUrl = data.getString("fmp4"); // 鍙杕p4鍦板潃
             if (StringUtils.hasText(rtspUrl)) {
+                System.out.println("鐩爣鍦板潃锛�" + rtspUrl);
+                FFmpegFrameGrabber grabber = null;
                 try {
-                    FFmpegFrameGrabber grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
-                    grabber.setOption("rtsp_transport", "tcp"); // 浣跨敤tcp鐨勬柟寮忥紝涓嶇劧浼氫涪鍖呭緢涓ラ噸
-                    grabber.setImageWidth(960);
-                    grabber.setImageHeight(540);
+                    grabber = new FFmpegFrameGrabber(rtspUrl);
+//                    grabber.setOption("rtsp_transport", "tcp"); // 浣跨敤tcp鐨勬柟寮忥紝涓嶇劧浼氫涪鍖呭緢涓ラ噸
+//                    grabber.setVideoOption("probesize", "10000"); // 璁剧疆鎹曡幏鍒嗘瀽鐨勬渶澶у瓧鑺�
                     grabber.start();
-                    CanvasFrame canvasFrame = new CanvasFrame("姝h寕");// 鍒涘缓绐楀彛
-                    canvasFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);// 璁剧疆绐楀彛鍏抽棴绋嬪簭鏄惁涔熻窡闅忓叧闂�
-                    canvasFrame.setAlwaysOnTop(true);
-
-                    OpenCVFrameConverter.ToMat converter = new OpenCVFrameConverter.ToMat();
-                    int ex = 0;
-                    while (true) {
-                        if (ex > 1) {
-                            break;
-                        }
-                        Frame frame = grabber.grabImage();
-                        canvasFrame.showImage(frame);
-                        //绋嬪簭鍒拌繖閲屽叾瀹炲凡缁忓疄鐜颁簡棰勮鐨勫姛鑳戒簡锛屼笅闈㈢殑鏂规硶灏辨槸灏嗘祦淇濆瓨鎴愬浘鐗�
-
-                        //opencv_core.Mat
+                    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";
@@ -800,37 +792,39 @@
                         String imgPath = PlatformConfig.getProfile() + "/" + imgUrl;
                         System.out.println("鍥剧墖淇濆瓨鍦板潃锛�" + imgPath);
                         imgUrl = Constants.RESOURCE_PREFIX + "/" + imgUrl;
-
+                        // 淇濆瓨鍥剧墖
                         opencv_imgcodecs.imwrite(imgPath, mat);
-
-                        ex++;
-                        try {
-                            Thread.sleep(1000);
-                        }
-                        catch (InterruptedException e)
-                        {
-                            e.printStackTrace();
-                        } // 1000姣鍒锋柊涓�娆″湒鍍�
+                    } else {
+                        System.out.println("鏈崟鑾峰埌甯�");
                     }
-                    grabber.stop(); // 鍋滄鎹曡幏
-                    grabber.release(); // 閲婃斁璧勬簮
-                } catch (IOException e) {
+                } catch (FrameGrabber.Exception e) {
                     e.printStackTrace();
+                } finally {
+                    if (grabber != null) {
+                        try {
+                            grabber.stop(); // 鍋滄鎹曡幏
+                        } catch (FrameGrabber.Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
                 }
             }
+        } else {
+            System.out.println("璇锋眰澶辫触锛岄敊璇爜锛�" + wvpResult.getCode() + "--" + wvpResult.getMsg());
         }
+        System.out.println("鍥剧墖URL锛�" + imgUrl);
         return imgUrl;
     }
 
     @Override
-    public void saveFrameImgByDevice(String deviceId, String channelId, String workOrderNo) {
+    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鍦板潃
+            String rtspUrl = data.getString("rtsp"); // 鍙杕p4鍦板潃
             if (StringUtils.hasText(rtspUrl)) {
                 System.out.println("鐩爣鍦板潃锛�" + rtspUrl);
                 FFmpegFrameGrabber grabber = null;
@@ -884,13 +878,13 @@
     }
 
     @Override
-    public List<DeviceInfoVO> hasErrorWorkOrderList(Date start, Date end) {
+    public List<DeviceInfoVO> hasErrorWorkOrderList (Date start, Date end){
         List<DeviceInfoVO> list = baseMapper.hasErrorWorkOrderList(start, end);
         return list;
     }
 
     @Override
-    public void updateImgById(Integer workOrderId, String imgPath) {
+    public void updateImgById (Integer workOrderId, String imgPath){
         new LambdaUpdateChainWrapper<>(baseMapper)
                 .eq(WorkOrder::getId, workOrderId)
                 .set(WorkOrder::getYwCheckResult, imgPath)
@@ -898,7 +892,7 @@
     }
 
     @Override
-    public Result processImg(String workOrderNo) {
+    public Result processImg (String workOrderNo){
         WorkOrder workOrder = new LambdaQueryChainWrapper<>(baseMapper)
                 .eq(WorkOrder::getWorkOrderNo, workOrderNo)
                 .one();
@@ -939,7 +933,7 @@
     }
 
     @Override
-    public Result detailByNo(String workOrderNo) {
+    public Result detailByNo (String workOrderNo){
         WorkOrderDetailVO workOrder = baseMapper.detailByNo(workOrderNo);
         // 鏄惁鎶ュ
         boolean hasReport = new LambdaQueryChainWrapper<>(reportMapper)
@@ -961,7 +955,7 @@
     }
 
     @Override
-    public List<WorkOrderVO> export(WorkOrderExportQuery query) {
+    public List<WorkOrderVO> export (WorkOrderExportQuery query){
         query.setUnitId(SecurityUtils.getUnitId());
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if (query.getStart() == null) {

--
Gitblit v1.8.0