From 9f5b9db2c8cdbcf74bd2eecefc3557d4048b8d4c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 28 八月 2024 17:54:51 +0800
Subject: [PATCH] 打通大华OSD

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java |   72 ++++++++++++++++++++++++------------
 1 files changed, 48 insertions(+), 24 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 908915b..050a9cf 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
@@ -121,6 +121,12 @@
         List<WorkOrderErrorType> waitAddErrorTypeList = new ArrayList<>(48);
         Integer updateNum = 0;
         Date now = new Date();
+        // 鍥犳晠闅滅被鍨嬩笉涓�鑷磋�岃鏇存柊鐘舵�佺殑宸ュ崟
+        List<WorkOrder> willUpdateStatusWorkOrderList = new ArrayList<>(48);
+        // 鏇存敼宸ュ崟绫诲瀷鑰岃澧炲姞鐨勭郴缁熻繍缁村鐞嗕俊鎭�
+        List<WorkOrderYwConditionRecord> willAddMsg = new ArrayList<>(48);
+        // 鍗冲皢瑕佹坊鍔犵殑閿欒绫诲瀷
+        List<WorkOrderErrorType> willAddErrorType = new ArrayList<>(96);
         for (WorkOrder workOrder : workOrderList) {
             WorkOrder databaseWorkOrder = mapping.get(workOrder.getSerialNumber());
             if (Objects.nonNull(databaseWorkOrder)) {
@@ -138,20 +144,21 @@
                             workOrderErrorType.setCreateTime(now);
                             workOrderErrorType.setUpdateTime(now);
                             workOrderErrorType.setErrorName(errorType);
-                            workOrderErrorTypeService.save(workOrderErrorType);
+                            willAddErrorType.add(workOrderErrorType);
                         }
                     }
                     databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
                     databaseWorkOrder.setUpdateTime(now);
-                    baseMapper.updateById(databaseWorkOrder);
+                    willUpdateStatusWorkOrderList.add(databaseWorkOrder);
                     updateNum++;
                     // 鍚屾椂鏂板涓�涓繍缁村鐞嗕俊鎭紝琛ㄦ槑姝ゅ伐鍗曡璋冩暣
                     WorkOrderYwConditionRecord ywRecord = new WorkOrderYwConditionRecord();
-                    ywRecord.setWorkOrderId(databaseWorkOrder.getId());
+                    ywRecord.setWorkOrderNo(databaseWorkOrder.getWorkOrderNo());
                     ywRecord.setCommitUser(1);
                     ywRecord.setYwCondition("鏁呴殰绫诲瀷鏇存柊锛屽伐鍗曠姸鎬佽皟鏁翠负寰呭鐞�");
                     ywRecord.setCreateTime(new Date());
-                    workOrderYwConditionRecordMapper.insert(ywRecord);
+                    ywRecord.setSysMsg(Boolean.TRUE);
+                    willAddMsg.add(ywRecord);
                 }
             } else {
                 workOrder.setCreateTime(new Date());
@@ -163,6 +170,15 @@
 //                }
                 waitAddList.add(workOrder);
             }
+        }
+        if (willAddErrorType.size() > 0) {
+            workOrderErrorTypeService.getBaseMapper().addMany(willAddErrorType);
+        }
+        if (willAddMsg.size() > 0) {
+            workOrderYwConditionRecordMapper.insertMany(willAddMsg);
+        }
+        if (willUpdateStatusWorkOrderList.size() > 0) {
+            this.baseMapper.updateMany(willUpdateStatusWorkOrderList);
         }
         if (CollectionUtils.isEmpty(waitAddList)) {
             return Boolean.TRUE;
@@ -285,7 +301,7 @@
         baseMapper.updateById(workOrder);
         // 娣诲姞涓�鏉″鏍歌褰�
         WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
-        workOrderAuditingRecord.setWorkOrderId(workOrder.getId());
+        workOrderAuditingRecord.setWorkOrderNo(workOrder.getWorkOrderNo());
         workOrderAuditingRecord.setAuditingUser(SecurityUtils.getLoginUser().getUserId().intValue());
         workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc());
         workOrderAuditingRecord.setRemark(form.getAuditingRemark());
@@ -316,18 +332,18 @@
         if (list.isEmpty()) {
             return Result.error("娌℃湁宸ュ崟鍙互瀹℃牳");
         }
-        List<Integer> ids = list.stream().map(WorkOrder::getId).collect(Collectors.toList());
+        List<String> workOrderNoList = list.stream().map(WorkOrder::getWorkOrderNo).collect(Collectors.toList());
         List<String> serialNumbers = list.stream().map(WorkOrder::getSerialNumber).toList();
         // 宸ュ崟鐘舵��
         LambdaUpdateWrapper<WorkOrder> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-        lambdaUpdateWrapper.in(WorkOrder::getId, ids);
+        lambdaUpdateWrapper.in(WorkOrder::getWorkOrderNo, workOrderNoList);
         lambdaUpdateWrapper.set(WorkOrder::getStatus, form.getAuditingResult());
         baseMapper.update(lambdaUpdateWrapper);
         // 娣诲姞澶氭潯瀹℃牳璁板綍
         List<WorkOrderAuditingRecord> workOrderAuditingRecords = new ArrayList<>();
-        for (Integer id : ids) {
+        for (String workOrderNo : workOrderNoList) {
             WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord();
-            workOrderAuditingRecord.setWorkOrderId(id);
+            workOrderAuditingRecord.setWorkOrderNo(workOrderNo);
             workOrderAuditingRecord.setAuditingUser(SecurityUtils.getLoginUser().getUserId().intValue());
             workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc());
             workOrderAuditingRecord.setRemark(form.getAuditingRemark());
@@ -365,7 +381,7 @@
         baseMapper.updateById(workOrder);
         // 娣诲姞涓�鏉¤繍缁存儏鍐佃褰�
         WorkOrderYwConditionRecord workOrderYwConditionRecord = new WorkOrderYwConditionRecord();
-        workOrderYwConditionRecord.setWorkOrderId(workOrder.getId());
+        workOrderYwConditionRecord.setWorkOrderNo(workOrder.getWorkOrderNo());
         workOrderYwConditionRecord.setCommitUser(SecurityUtils.getLoginUser().getUserId().intValue());
         workOrderYwConditionRecord.setYwCondition(form.getYwCondition());
         workOrderYwConditionRecord.setYwProofMaterials(form.getYwProofMaterials());
@@ -375,8 +391,8 @@
     }
 
     @Override
-    public Result selectYwConditionByYwId(Integer id) {
-        List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(id);
+    public Result selectYwConditionByYwId(String workOrderNo) {
+        List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo);
         ywConditionList.stream().forEach(item -> {
             if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) {
                 item.setCommitUserName("绯荤粺娑堟伅");
@@ -386,10 +402,10 @@
     }
 
     @Override
-    public Result selectYwAuditingListByYwId(String id) {
+    public Result selectYwAuditingListByYwId(String workOrderNo) {
         return Result.ok().data(
                 new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
-                        .eq(WorkOrderAuditingRecord::getWorkOrderId, id)
+                        .eq(WorkOrderAuditingRecord::getWorkOrderNo, workOrderNo)
                         .orderByAsc(WorkOrderAuditingRecord::getCreateTime)
                         .list());
     }
@@ -646,12 +662,15 @@
 
     @Override
     public String getFrameImgByDevice(String deviceId, String channelId) {
-        String url = String.format(this.rtspServer + "/start/%s/%s", deviceId, channelId);
+        String url = String.format(this.rtspServer + "/api/play/start/%s/%s", deviceId, channelId);
         String result = HttpUtils.sendGet(url);
+        log.error("鎷垮埌鍙栨祦鍝嶅簲缁撴灉锛�" + result);
         WVPResult wvpResult = JSON.parseObject(result, WVPResult.class);
         if (0 == wvpResult.getCode()) {
+            log.error("璇锋眰鎴愬姛");
             StreamContent data = (StreamContent) wvpResult.getData();
             String rtspUrl = data.getRtsp();
+            log.error("鐩爣鍦板潃锛�" + rtspUrl);
             if (StringUtils.hasText(rtspUrl)) {
                 try {
                     // 鍒涘缓FFmpegFrameGrabber瀵硅薄
@@ -659,18 +678,23 @@
                     grabber.start(); // 寮�濮嬫崟鑾�
 
                     Frame frame;
-                    if ((frame = grabber.grabFrame()) != null) {
-                        // 灏嗗抚杞崲涓哄浘鐗�
-                        Java2DFrameConverter converter = new Java2DFrameConverter();
-                        BufferedImage image = converter.convert(frame);
-                        File outputfile = new File(serverConfig.getUrl() + PlatformConfig.getUploadPath() + deviceId + IdUtils.fastSimpleUUID() + ".png");
-                        ImageIO.write(image, "png", outputfile);
-                        String imgPath = outputfile.getAbsolutePath();
-                        System.out.println("Saved " + imgPath);
-                        return imgPath;
+                    String imgPath;
+                    while (true) {
+                        frame = grabber.grabFrame();
+                        if (Objects.nonNull(frame)) {
+                            // 灏嗗抚杞崲涓哄浘鐗�
+                            Java2DFrameConverter converter = new Java2DFrameConverter();
+                            BufferedImage image = converter.convert(frame);
+                            File outputfile = new File(serverConfig.getUrl() + PlatformConfig.getUploadPath() + deviceId + IdUtils.fastSimpleUUID() + ".png");
+                            ImageIO.write(image, "png", outputfile);
+                            imgPath = outputfile.getAbsolutePath();
+                            log.error("鍥剧墖鍦板潃锛� " + imgPath);
+                            break;
+                        }
                     }
                     grabber.stop(); // 鍋滄鎹曡幏
                     grabber.release(); // 閲婃斁璧勬簮
+                    return imgPath;
                 } catch (IOException e) {
                     e.printStackTrace();
                 }

--
Gitblit v1.8.0