From b9ea75683423b46cb4d2aea2961cbb3c6c8837f7 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 30 九月 2024 11:16:33 +0800
Subject: [PATCH] 工单取图片优化
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 108 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 73 insertions(+), 35 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 7fd7d38..a1bbc45 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
@@ -1,5 +1,6 @@
package com.ycl.platform.service.impl;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -55,6 +56,14 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
+import javax.swing.*;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
@@ -93,7 +102,6 @@
@Override
@Transactional(rollbackFor = Exception.class)
- //TODO锛歊edis鍔犻攣锛屼粠Redis璇诲彇褰撴棩宸ュ崟鏁版嵁閲�
public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
int total = workOrderList.size();
workOrderList.stream().filter(item -> {
@@ -231,7 +239,7 @@
}
//鏁板瓧鍓嶉潰琛�0
workOrderNum++;
- workOrder.setWorkOrderNo(IdUtils.randomNO(now, String.format("%05d", workOrderNum)));
+ workOrder.setWorkOrderNo(IdUtils.workOrderNO(now, String.format("%05d", workOrderNum)));
if (Objects.nonNull(point.getUnitId())) {
workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
}
@@ -292,14 +300,14 @@
@Override
public Result add(WorkOrderForm form) {
//鏌edis浠婃棩宸ュ崟鏁伴噺
- int workOrderNum = 1;
+ int workOrderNum = 0;
//UUID浣滀负value锛屼繚璇佷笂閿佺殑绾跨▼鑷繁瑙ｉ攣
String requestId = IdUtils.fastSimpleUUID();
boolean result = redisCache.acquireLock(RedisConstant.WORKORDER_NUM_LOCK, requestId, 10000);
if (result) {
//鏌ヤ粖鏃ュ伐鍗曢噺
Object redisNum = redisCache.getCacheObject(RedisConstant.WORKORDER_NUM);
- workOrderNum = redisNum == null ? 1 : (Integer) redisNum;
+ workOrderNum = redisNum == null ? 0 : (Integer) redisNum;
workOrderNum++;
redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum);
redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId);
@@ -312,7 +320,7 @@
Date now = new Date();
entity.setCreateTime(now);
entity.setUpdateTime(now);
- entity.setWorkOrderNo(IdUtils.randomNO(now, String.format("%05d", workOrderNum)));
+ entity.setWorkOrderNo(IdUtils.workOrderNO(now, String.format("%05d", workOrderNum)));
entity.setErrorType(String.join(",", form.getErrorType()));
List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType)).toList();
workOrderErrorTypeService.getBaseMapper().insertWorkOrderErrorTypeList(workOrderErrorTypes);
@@ -558,7 +566,7 @@
.select(WorkOrder::getSerialNumber, WorkOrder::getWorkOrderNo)
.eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
.eq(Objects.nonNull(data.getUnitId()), WorkOrder::getUnitId, data.getUnitId())
- .eq(WorkOrder::getErrorType, data.getErrorType())
+ .in(WorkOrder::getErrorType, data.getErrorType())
.between(WorkOrder::getCreateTime, data.getStart(), data.getEnd())
.orderByDesc(WorkOrder::getCreateTime)
.last("limit " + data.getFastNumLimit())
@@ -620,6 +628,7 @@
ywPointService.updateRecovery(serialNumberList, 1);
return Result.ok("鎴愬姛涓嬪彂" + query.getWorkOrderNOList().size() + "鏉″伐鍗�");
} catch (Exception e) {
+ System.out.println(e.getMessage());
return Result.error("鎿嶄綔澶辫触");
} finally {
distributeUnLock();
@@ -751,27 +760,39 @@
@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);
+ log.error("鎷垮埌鍙栨祦鍝嶅簲缁撴灉锛�" + result);
WVPResult wvpResult = JSON.parseObject(result, WVPResult.class);
String imgUrl = null;
- if (wvpResult.getCode() == 0) {
+ if (0 == wvpResult.getCode()) {
+ log.error("璇锋眰鎴愬姛");
JSONObject data = (JSONObject) wvpResult.getData();
- String rtspUrl = data.getString("fmp4"); // 鍙杕p4鍦板潃
+ String rtspUrl = data.getString("rtsp"); // 鍙栧湴鍧�
+ log.error("鐩爣鍦板潃锛�" + rtspUrl);
if (StringUtils.hasText(rtspUrl)) {
- System.out.println("鐩爣鍦板潃锛�" + rtspUrl);
- FFmpegFrameGrabber grabber = null;
try {
- grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
- //璁剧疆10s瓒呮椂
- grabber.setTimeout(10000);
+ FFmpegFrameGrabber grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
+ grabber.setOption("rtsp_transport", "tcp"); // 浣跨敤tcp鐨勬柟寮忥紝涓嶇劧浼氫涪鍖呭緢涓ラ噸
+ grabber.setImageWidth(960);
+ grabber.setImageHeight(540);
grabber.start();
- Frame frame = grabber.grabImage(); // 鐩存帴鎹曡幏涓�甯�
- if (frame != null) {
- System.out.println("鎴愬姛鎹曡幏涓�甯�");
- // 灏咶rame杞崲涓篗at
- OpenCVFrameConverter.ToMat converter = new OpenCVFrameConverter.ToMat();
+ CanvasFrame canvasFrame = new CanvasFrame("姝ｈ寕");// 鍒涘缓绐楀彛
+ 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
Mat mat = converter.convertToMat(frame);
imgUrl = workOrderNo + "_" + IdUtils.fastSimpleUUID() + ".png";
@@ -779,29 +800,25 @@
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) {
+
+ ex++;
try {
- grabber.stop(); // 鍋滄鎹曡幏
- } catch (FrameGrabber.Exception e) {
- e.printStackTrace();
+ Thread.sleep(1000);
}
- // 閫氬父涓嶉渶瑕佽皟鐢╮elease()锛屽洜涓簊top()浼氬鐞嗚祫婧愰噴鏀�
- // grabber.release(); // 閲婃斁璧勬簮
+ catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ } // 1000姣鍒锋柊涓�娆″湒鍍�
}
+ grabber.stop(); // 鍋滄鎹曡幏
+ grabber.release(); // 閲婃斁璧勬簮
+ } catch (IOException e) {
+ e.printStackTrace();
}
}
- } else {
- System.out.println("璇锋眰澶辫触锛岄敊璇爜锛�" + wvpResult.getCode());
}
- System.out.println("鍥剧墖URL锛�" + imgUrl);
return imgUrl;
}
@@ -942,4 +959,25 @@
workOrder.setImgList(imgList);
return Result.ok().data(workOrder);
}
+
+ @Override
+ public List<WorkOrderVO> export(WorkOrderExportQuery query) {
+ query.setUnitId(SecurityUtils.getUnitId());
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if (query.getStart() == null) {
+ query.setStart(format.format(DateUtils.getDayStart(new Date())));
+ } else {
+ query.setStart(query.getStart() + " 00:00:00");
+ }
+ if (query.getEnd() == null) {
+ query.setStart(format.format(DateUtils.getDayEnd(new Date())));
+ } else {
+ query.setEnd(query.getEnd() + " 23:59:59");
+ }
+
+ List<WorkOrderVO> export = baseMapper.export(query);
+
+ System.out.println(export);
+ return export;
+ }
}
--
Gitblit v1.8.0