From 616762daea1e46ace3a8ff2ee8e3975e5bcccd24 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 18 九月 2024 20:14:22 +0800
Subject: [PATCH] 工单取图片定时任务不用线程池
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 289 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 222 insertions(+), 67 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 b26d549..b89867f 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;
@@ -28,6 +26,7 @@
import com.ycl.platform.wvp.WVPResult;
import com.ycl.system.Result;
import com.ycl.system.domain.SysConfig;
+import com.ycl.system.entity.SysDictData;
import com.ycl.system.mapper.SysConfigMapper;
import com.ycl.system.mapper.SysDictDataMapper;
import com.ycl.system.model.LoginUser;
@@ -37,6 +36,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;
@@ -44,9 +44,9 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
-import org.bytedeco.javacv.FFmpegFrameGrabber;
-import org.bytedeco.javacv.Frame;
-import org.bytedeco.javacv.Java2DFrameConverter;
+import org.bytedeco.javacv.*;
+import org.bytedeco.opencv.global.opencv_imgcodecs;
+import org.bytedeco.opencv.opencv_core.Mat;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -56,10 +56,6 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
@@ -77,7 +73,6 @@
@RequiredArgsConstructor
public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
- private final WorkOrderMapper workOrderMapper;
private final YwPointService ywPointService;
private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper;
private final WorkOrderAuditingRecordService workOrderAuditingRecordService;
@@ -86,9 +81,8 @@
private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper;
private final WorkOrderErrorTypeServiceImpl workOrderErrorTypeService;
private final SysConfigMapper configMapper;
- private final ServerConfig serverConfig;
private final ReportMapper reportMapper;
- private final SysDictDataMapper dictDataMapper;
+ private final WorkOrderCheckImgMapper workOrderCheckImgMapper;
@Value("${rtsp.server:http://127.0.0.1:7788}")
private String rtspServer;
@@ -101,21 +95,31 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
+ public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
int total = workOrderList.size();
workOrderList.stream().filter(item -> {
- return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && StringUtils.hasText(item.getErrorType());
+ return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && !CollectionUtils.isEmpty(item.getErrorTypeList());
});
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)
- .select(WorkOrder::getId, WorkOrder::getSerialNumber, WorkOrder::getStatus, WorkOrder::getWorkOrderNo)
- .in(WorkOrder::getSerialNumber, serialNumberList)
- .ne(WorkOrder::getStatus, WorkOrderStatusEnum.AUDITING_SUCCESS)
- .list();
+ List<WorkOrder> inDatabaseWorkOrderList = baseMapper.getNotFinishedWorkOrders(serialNumberList);
+ inDatabaseWorkOrderList.stream().forEach(item -> {
+ if (StringUtils.hasText(item.getErrorType())) {
+ item.setErrorTypeList(List.of(item.getErrorType().split(",")));
+ } else {
+ item.setErrorTypeList(new ArrayList<>(1));
+ }
+ });
Map<String, WorkOrder> mapping = inDatabaseWorkOrderList.stream().collect((Collectors.toMap(WorkOrder::getSerialNumber, workOrder -> workOrder)));
List<WorkOrder> waitAddList = new ArrayList<>(48);
List<WorkOrderErrorType> waitAddErrorTypeList = new ArrayList<>(48);
@@ -130,7 +134,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 = databaseWorkOrder.getErrorTypeList();
List<String> errorTypes = workOrder.getErrorTypeList();
if (errorNameList.containsAll(errorTypes)) {
// 濡傛灉锛屽浗鏍囩爜銆佹晠闅滅被鍨嬮兘涓�鏍凤紝鍒欒烦杩囦笉澶勭悊
@@ -157,6 +161,7 @@
ywRecord.setCommitUser(1);
ywRecord.setYwCondition("鏁呴殰绫诲瀷鏇存柊锛屽伐鍗曠姸鎬佽皟鏁翠负寰呭鐞�");
ywRecord.setCreateTime(new Date());
+ ywRecord.setSysMsg(Boolean.TRUE);
willAddMsg.add(ywRecord);
}
} else {
@@ -176,6 +181,7 @@
if (willAddMsg.size() > 0) {
workOrderYwConditionRecordMapper.insertMany(willAddMsg);
}
+ log.info("灏嗚鏇存柊鐨勫伐鍗曟暟锛�" + willUpdateStatusWorkOrderList.size());
if (willUpdateStatusWorkOrderList.size() > 0) {
this.baseMapper.updateMany(willUpdateStatusWorkOrderList);
}
@@ -199,7 +205,7 @@
notAddList.add(workOrder);
continue;
}
- workOrder.setWorkOrderNo(IdUtils.randomNO());
+ workOrder.setWorkOrderNo(IdUtils.randomNO(now));
if (Objects.nonNull(point.getUnitId())) {
workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
}
@@ -256,12 +262,12 @@
@Override
public Result add(WorkOrderForm form) {
WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
- entity.setWorkOrderNo(IdUtils.randomNO());
entity.setCreateTime(DateUtils.getNowDate());
entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
Date now = new Date();
entity.setCreateTime(now);
entity.setUpdateTime(now);
+ entity.setWorkOrderNo(IdUtils.randomNO(now));
entity.setErrorType(String.join(",", form.getErrorType()));
List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType)).toList();
workOrderErrorTypeService.getBaseMapper().insertWorkOrderErrorTypeList(workOrderErrorTypes);
@@ -300,7 +306,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());
@@ -331,18 +337,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());
@@ -390,23 +396,22 @@
}
@Override
- public Result selectYwConditionByYwId(Integer id) {
- List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(id);
+ 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("绯荤粺娑堟伅");
+ item.setUnitName("绯荤粺娑堟伅");
}
});
- return Result.ok().data(ywConditionList);
+ return ywConditionList;
}
@Override
- public Result selectYwAuditingListByYwId(String id) {
- return Result.ok().data(
- new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
- .eq(WorkOrderAuditingRecord::getWorkOrderId, id)
+ public List<WorkOrderAuditingRecord> selectYwAuditingListByYwId(String workOrderNo) {
+ return new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
+ .eq(WorkOrderAuditingRecord::getWorkOrderNo, workOrderNo)
.orderByAsc(WorkOrderAuditingRecord::getCreateTime)
- .list());
+ .list();
}
@Override
@@ -453,11 +458,15 @@
@Override
public Result page(WorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
+ query.setUnitId(SecurityUtils.getUnitId());
baseMapper.page(page, query);
if (! CollectionUtils.isEmpty(page.getRecords())) {
page.getRecords().stream().forEach(item -> {
if (StringUtils.hasText(item.getErrorType())) {
item.setErrorTypeList(List.of(item.getErrorType().split(",")));
+ }
+ if (StringUtils.hasText(item.getImgListStr())) {
+ item.setImgList(List.of(item.getImgListStr().split(",")));
}
});
}
@@ -478,9 +487,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;
@@ -490,8 +496,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)
@@ -660,43 +670,124 @@
@Override
- public String getFrameImgByDevice(String deviceId, String channelId) {
- String url = String.format(this.rtspServer + "/start/%s/%s", deviceId, 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);
WVPResult wvpResult = JSON.parseObject(result, WVPResult.class);
- if (0 == wvpResult.getCode()) {
- StreamContent data = (StreamContent) wvpResult.getData();
- String rtspUrl = data.getRtsp();
+ 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瀵硅薄
- FFmpegFrameGrabber grabber = new FFmpegFrameGrabber(rtspUrl);
- grabber.start(); // 寮�濮嬫崟鑾�
+ grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
+ //璁剧疆10s瓒呮椂
+ grabber.setTimeout(10000);
+ 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);
- 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;
+ 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(); // 閲婃斁璧勬簮
- } 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 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鍦板潃
+ if (StringUtils.hasText(rtspUrl)) {
+ System.out.println("鐩爣鍦板潃锛�" + rtspUrl);
+ FFmpegFrameGrabber grabber = null;
+ try {
+ grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
+ //璁剧疆10s瓒呮椂
+ grabber.setTimeout(10000);
+ 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.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) {
+ try {
+ grabber.stop(); // 鍋滄鎹曡幏
+ } catch (FrameGrabber.Exception e) {
+ e.printStackTrace();
+ }
+ // 閫氬父涓嶉渶瑕佽皟鐢╮elease()锛屽洜涓簊top()浼氬鐞嗚祫婧愰噴鏀�
+ // grabber.release(); // 閲婃斁璧勬簮
+ }
+ }
+ }
+ } else {
+ System.out.println("璇锋眰澶辫触锛岄敊璇爜锛�" + wvpResult.getCode());
+ }
+ System.out.println("鍥剧墖URL锛�" + imgUrl);
+ if (StringUtils.hasText(imgUrl)) {
+ WorkOrderCheckImg img = new WorkOrderCheckImg();
+ img.setWorkOrderNo(workOrderNo);
+ img.setImgUrl(imgUrl);
+ img.setCreateTime(new Date());
+ workOrderCheckImgMapper.insert(img);
+ }
+ }
+
+ @Override
+ public List<DeviceInfoVO> hasErrorWorkOrderList(Date start, Date end) {
+ List<DeviceInfoVO> list = baseMapper.hasErrorWorkOrderList(start, end);
return list;
}
@@ -704,6 +795,70 @@
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) {
+ WorkOrder workOrder = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(WorkOrder::getWorkOrderNo, workOrderNo)
+ .one();
+ if (Objects.isNull(workOrder)) {
+ throw new RuntimeException("姝ゅ伐鍗曚笉瀛樺湪");
+ }
+ // 杩愮淮璁板綍
+ List<WorkOrderYwConditionRecordVO> workOrderYwConditionRecordVOS = this.selectYwConditionByYwId(workOrderNo);
+ // 瀹℃牳璁板綍
+ List<WorkOrderAuditingRecord> workOrderAuditingRecords = this.selectYwAuditingListByYwId(workOrderNo);
+ WorkOrderProcessVO process = new WorkOrderProcessVO();
+ process.setYwList(workOrderYwConditionRecordVOS);
+ process.setAuditingList(workOrderAuditingRecords);
+ // 鏌ヨ鐐逛綅浜嬪墠浜嬪悗鏈�鏂扮殑涓�鏉℃暟鎹槸鍚﹀鏍搁�氳繃
+ ReportAuditingRecordVO beforeRecord = ywPointService.getReportResult(workOrder.getSerialNumber(), "浜嬪墠鎶ュ");
+ ReportAuditingRecordVO afterRecord = ywPointService.getReportResult(workOrder.getSerialNumber(), "浜嬪悗鎶ュ");
+
+ Date now = new Date();
+ if (Objects.nonNull(beforeRecord)) {
+ if (now.before(beforeRecord.getBeginCreateTime())) {
+ process.setBeforeReportMsg("浜嬪墠鎶ュ宸插け鏁�");
+ } else if (now.after(beforeRecord.getEndCreateTime())){
+ process.setBeforeReportMsg("浜嬪墠鎶ュ鏈敓鏁�");
+ } else {
+ process.setBeforeReportMsg("宸蹭簨鍓嶆姤澶�");
+ }
+ }
+ if (Objects.nonNull(afterRecord)) {
+ if (now.before(afterRecord.getBeginCreateTime())) {
+ process.setAfterReportMsg("浜嬪悗鎶ュ宸插け鏁�");
+ } else if (now.after(afterRecord.getEndCreateTime())){
+ process.setAfterReportMsg("浜嬪悗鎶ュ鏈敓鏁�");
+ } else {
+ process.setAfterReportMsg("宸蹭簨鍚庢姤澶�");
+ }
+ }
+ return Result.ok().data(process);
+ }
+
+ @Override
+ public Result detailByNo(String workOrderNo) {
+ WorkOrderDetailVO workOrder = baseMapper.detailByNo(workOrderNo);
+ // 鏄惁鎶ュ
+ boolean hasReport = new LambdaQueryChainWrapper<>(reportMapper)
+ .eq(Report::getSerialNumber, workOrder.getSerialNumber())
+ .exists();
+ workOrder.setHasReport(hasReport);
+ // 鏁呴殰绫诲瀷
+ List<SysDictData> errorList = workOrderErrorTypeService.getBaseMapper().getErrorList(workOrder.getWorkOrderNo());
+ List<String> errList = errorList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());
+ workOrder.setErrorTypeList(errList);
+ // 妫�娴嬪浘鐗�
+ List<WorkOrderCheckImg> imgList = new LambdaQueryChainWrapper<>(workOrderCheckImgMapper)
+ .eq(WorkOrderCheckImg::getWorkOrderNo, workOrderNo)
+ .orderByDesc(WorkOrderCheckImg::getCreateTime)
+ .last("limit 20")
+ .list();
+ workOrder.setImgList(imgList);
+ return Result.ok().data(workOrder);
}
}
--
Gitblit v1.8.0