From 1aa2a59a237dbc4c58a5e3d09be2bfeaf1535c8b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 31 八月 2024 21:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 138 ++++++++++++++++++++++++++--------------------
1 files changed, 78 insertions(+), 60 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 d944fb8..b7b68f1 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,6 +1,7 @@
package com.ycl.platform.service.impl;
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
@@ -12,10 +13,7 @@
import com.ycl.platform.domain.entity.*;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.*;
-import com.ycl.platform.domain.vo.DeviceInfoVO;
-import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
-import com.ycl.platform.domain.vo.WorkOrderVO;
-import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
+import com.ycl.platform.domain.vo.*;
import com.ycl.platform.domain.vo.screen.ScreenWorkOrderVO;
import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO;
import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO;
@@ -37,6 +35,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;
@@ -110,6 +109,13 @@
if (CollectionUtils.isEmpty(workOrderList)) {
return Boolean.TRUE;
}
+ // 鏍规嵁鍥芥爣鐮佸幓閲�
+ workOrderList = workOrderList.stream()
+ .collect(Collectors.toMap(
+ WorkOrder::getSerialNumber,
+ p -> p,
+ (existing, replacement) -> existing // 鍐茬獊鏃朵繚鐣欑涓�涓�
+ )).values().stream().collect(Collectors.toList());
List<String> serialNumberList = workOrderList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
// 鏌ュ嚭鏁版嵁搴撲腑鍥芥爣鐮佸搴旂殑鏈畬鎴愮殑宸ュ崟
List<WorkOrder> inDatabaseWorkOrderList = new LambdaQueryChainWrapper<>(baseMapper)
@@ -131,7 +137,7 @@
for (WorkOrder workOrder : workOrderList) {
WorkOrder databaseWorkOrder = mapping.get(workOrder.getSerialNumber());
if (Objects.nonNull(databaseWorkOrder)) {
- List<String> errorNameList = workOrderErrorTypeService.getBaseMapper().getNotFinishWorkOrderErrors(workOrder.getWorkOrderNo());
+ List<String> errorNameList = workOrderErrorTypeService.getBaseMapper().getNotFinishWorkOrderErrors(databaseWorkOrder.getWorkOrderNo());
List<String> errorTypes = workOrder.getErrorTypeList();
if (errorNameList.containsAll(errorTypes)) {
// 濡傛灉锛屽浗鏍囩爜銆佹晠闅滅被鍨嬮兘涓�鏍凤紝鍒欒烦杩囦笉澶勭悊
@@ -178,6 +184,7 @@
if (willAddMsg.size() > 0) {
workOrderYwConditionRecordMapper.insertMany(willAddMsg);
}
+ log.info("灏嗚鏇存柊鐨勫伐鍗曟暟锛�" + willUpdateStatusWorkOrderList.size());
if (willUpdateStatusWorkOrderList.size() > 0) {
this.baseMapper.updateMany(willUpdateStatusWorkOrderList);
}
@@ -392,23 +399,22 @@
}
@Override
- public Result selectYwConditionByYwId(String workOrderNo) {
+ public List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo) {
List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo);
ywConditionList.stream().forEach(item -> {
if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) {
item.setCommitUserName("绯荤粺娑堟伅");
}
});
- return Result.ok().data(ywConditionList);
+ return ywConditionList;
}
@Override
- public Result selectYwAuditingListByYwId(String workOrderNo) {
- return Result.ok().data(
- new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
+ public List<WorkOrderAuditingRecord> selectYwAuditingListByYwId(String workOrderNo) {
+ return new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
.eq(WorkOrderAuditingRecord::getWorkOrderNo, workOrderNo)
.orderByAsc(WorkOrderAuditingRecord::getCreateTime)
- .list());
+ .list();
}
@Override
@@ -461,6 +467,9 @@
if (StringUtils.hasText(item.getErrorType())) {
item.setErrorTypeList(List.of(item.getErrorType().split(",")));
}
+ if (StringUtils.hasText(item.getImgListStr())) {
+ item.setImgList(List.of(item.getImgListStr().split(",")));
+ }
});
}
return Result.ok().data(page.getRecords()).total(page.getTotal());
@@ -480,9 +489,6 @@
LocalDateTime now = LocalDateTime.now(ZoneId.systemDefault());
data.setEnd(now);
switch (data.getFastWay()) {
- case LAST_HALF_HOUR:
- data.setStart(now.minusMinutes(30));
- break;
case LAST_HOUR:
data.setStart(now.minusHours(1));
break;
@@ -492,8 +498,12 @@
case LAST_DAY:
data.setStart(now.minusDays(1));
break;
+ default:
+ break;
}
-
+ if (Objects.isNull(data.getStart())) {
+ throw new RuntimeException("鏃犳硶鐢熸垚蹇�熶笅鍙戠殑鏃堕棿鑼冨洿锛岃閫夋嫨姝ｇ‘鐨勫揩閫熶笅鍙戞柟寮�");
+ }
// 鏌ヨ绗﹀悎鏉′欢鐨勫伐鍗�
List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
.select(WorkOrder::getSerialNumber, WorkOrder::getWorkOrderNo)
@@ -662,66 +672,61 @@
@Override
- public String getFrameImgByDevice(String deviceId, String channelId) {
+ 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);
- 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);
+ 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 {
- FFmpegFrameGrabber grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
- grabber.setOption("rtsp_transport", "tcp"); // 浣跨敤tcp鐨勬柟寮忥紝涓嶇劧浼氫涪鍖呭緢涓ラ噸
- grabber.setImageWidth(960);
- grabber.setImageHeight(540);
+ grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
grabber.start();
- CanvasFrame canvasFrame = new CanvasFrame("姝ｈ寕");// 鍒涘缓绐楀彛
- canvasFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);// 璁剧疆绐楀彛鍏抽棴绋嬪簭鏄惁涔熻窡闅忓叧闂�
- canvasFrame.setAlwaysOnTop(true);
-
- OpenCVFrameConverter.ToMat converter = new OpenCVFrameConverter.ToMat();
- int ex = 0;
- String imgPath = null;
- 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);
- imgPath = serverConfig.getUrl() + PlatformConfig.getUploadPath() + deviceId + IdUtils.fastSimpleUUID() + ".png";
- opencv_imgcodecs.imwrite(imgPath, mat);
- ex++;
- try {
- Thread.sleep(1000);
- }
- catch (InterruptedException e)
- {
- e.printStackTrace();
- } // 1000姣鍒锋柊涓�娆″湒鍍�
+ 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("鏈崟鑾峰埌甯�");
}
- grabber.stop(); // 鍋滄鎹曡幏
- grabber.release(); // 閲婃斁璧勬簮
- return imgPath;
- } catch (IOException e) {
+ } 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());
}
- return null;
+ System.out.println("鍥剧墖URL锛�" + imgUrl);
+ return imgUrl;
}
@Override
- public List<DeviceInfoVO> hasErrorWorkOrderList() {
- List<DeviceInfoVO> list = baseMapper.hasErrorWorkOrderList();
+ public List<DeviceInfoVO> hasErrorWorkOrderList(Date start, Date end) {
+ List<DeviceInfoVO> list = baseMapper.hasErrorWorkOrderList(start, end);
return list;
}
@@ -729,6 +734,19 @@
public void updateImgById(Integer workOrderId, String imgPath) {
new LambdaUpdateChainWrapper<>(baseMapper)
.eq(WorkOrder::getId, workOrderId)
- .set(WorkOrder::getYwCheckResult, imgPath);
+ .set(WorkOrder::getYwCheckResult, imgPath)
+ .update();
+ }
+
+ @Override
+ public Result processImg(String workOrderNo) {
+ // 杩愮淮璁板綍
+ List<WorkOrderYwConditionRecordVO> workOrderYwConditionRecordVOS = this.selectYwConditionByYwId(workOrderNo);
+ // 瀹℃牳璁板綍
+ List<WorkOrderAuditingRecord> workOrderAuditingRecords = this.selectYwAuditingListByYwId(workOrderNo);
+ WorkOrderProcessVO process = new WorkOrderProcessVO();
+ process.setYwList(workOrderYwConditionRecordVOS);
+ process.setAuditingList(workOrderAuditingRecords);
+ return Result.ok().data(process);
}
}
--
Gitblit v1.8.0