From 1901a22a3b2d7a2a076b69ecd78d24ec55d5a3e8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 266 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 241 insertions(+), 25 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 60d3cb8..c298405 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,52 +1,68 @@
package com.ycl.platform.service.impl;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.config.PlatformConfig;
+import com.ycl.config.ServerConfig;
import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.*;
import com.ycl.platform.domain.form.*;
-import com.ycl.platform.domain.query.DistributeWorkOrderQuery;
-import com.ycl.platform.domain.query.HomeQuery;
-import com.ycl.platform.domain.query.ScreenQuery;
-import com.ycl.platform.domain.query.WorkOrderQuery;
+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.screen.ScreenWorkOrderVO;
-import com.ycl.platform.mapper.WorkOrderAuditingRecordMapper;
-import com.ycl.platform.mapper.WorkOrderDistributeRecordMapper;
-import com.ycl.platform.mapper.WorkOrderMapper;
-import com.ycl.platform.mapper.WorkOrderYwConditionRecordMapper;
+import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO;
+import com.ycl.platform.domain.vo.screen.WorkOrderTotalVO;
+import com.ycl.platform.mapper.*;
import com.ycl.platform.service.NotifyService;
import com.ycl.platform.service.WorkOrderAuditingRecordService;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.platform.service.YwPointService;
+import com.ycl.platform.wvp.StreamContent;
+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.mapper.SysDictTypeMapper;
import com.ycl.system.model.LoginUser;
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
+import com.ycl.utils.http.HttpUtils;
import com.ycl.utils.redis.RedisCache;
import com.ycl.utils.uuid.IdUtils;
-import enumeration.general.NotifyTypeEnum;
-import enumeration.general.UrgentLevelEnum;
-import enumeration.general.WorkOrderDistributeWayEnum;
-import enumeration.general.WorkOrderStatusEnum;
+import enumeration.general.*;
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.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
+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.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -55,6 +71,7 @@
* @author xp
* @since 2024-03-05
*/
+@Slf4j
@Service
@RequiredArgsConstructor
public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
@@ -66,12 +83,142 @@
private final WorkOrderYwConditionRecordMapper workOrderYwConditionRecordMapper;
private final NotifyService notifyService;
private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper;
+ private final WorkOrderErrorTypeMapper workOrderErrorTypeMapper;
+ private final SysConfigMapper configMapper;
+ private final ServerConfig serverConfig;
+ private final ReportMapper reportMapper;
+ private final SysDictDataMapper dictDataMapper;
+
+ @Value("${rtsp.server:http://127.0.0.1:7788}")
+ private String rtspServer;
private final String DISTRIBUTE_LOCK_KEY = "distributeLock";
private final static String IMPORTANT = "important";
@Autowired
private RedisCache redisCache;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public 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());
+ });
+ if (CollectionUtils.isEmpty(workOrderList)) {
+ return Boolean.TRUE;
+ }
+ 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::getErrorType)
+ .in(WorkOrder::getSerialNumber, serialNumberList)
+ .ne(WorkOrder::getStatus, WorkOrderStatusEnum.AUDITING_SUCCESS)
+ .list();
+ Map<String, WorkOrder> mapping = inDatabaseWorkOrderList.stream().collect((Collectors.toMap(WorkOrder::getSerialNumber, workOrder -> workOrder)));
+ List<WorkOrder> waitAddList = new ArrayList<>(48);
+ Integer updateNum = 0;
+
+ for (WorkOrder workOrder : workOrderList) {
+ WorkOrder databaseWorkOrder = mapping.get(workOrder.getSerialNumber());
+ if (Objects.nonNull(databaseWorkOrder)) {
+ List<WorkOrderErrorType> workOrderErrorTypeList = new LambdaQueryChainWrapper<>(workOrderErrorTypeMapper)
+ .select(WorkOrderErrorType::getErrorName)
+ .eq(WorkOrderErrorType::getWorkOrderNo, workOrder.getWorkOrderNo())
+ .list();
+ List<String> errorNameList = workOrderErrorTypeList.stream().map(WorkOrderErrorType::getErrorName).collect(Collectors.toList());
+ String errorType = databaseWorkOrder.getErrorType();
+ if (errorNameList.contains(errorType)) {
+ // 濡傛灉锛屽浗鏍囩爜銆佹晠闅滅被鍨嬮兘涓�鏍凤紝鍒欒烦杩囦笉澶勭悊
+ continue;
+ } else {
+ // 閿欒绫诲瀷涓嶄竴鏍凤紝灏辨柊澧炰竴涓敊璇被鍨嬶紝骞朵笖閲嶇疆宸ュ崟鐘舵�佷负寰呭鐞�
+ List<SysDictData> errorTypeDictList = dictDataMapper.selectDictDataByType("error_type");
+ String finalErrorType = errorType;
+ List<SysDictData> targetErrorTypes = errorTypeDictList.stream().filter(item -> finalErrorType.equals(item.getDictValue())).collect(Collectors.toList());
+ if (! CollectionUtils.isEmpty(targetErrorTypes)) {
+ errorType = targetErrorTypes.get(0).getDictValue();
+ }
+ WorkOrderErrorType workOrderErrorType = new WorkOrderErrorType();
+ workOrderErrorType.setWorkOrderNo(databaseWorkOrder.getWorkOrderNo());
+ Date now = new Date();
+ workOrderErrorType.setCreateTime(now);
+ workOrderErrorType.setUpdateTime(now);
+ workOrderErrorTypeMapper.insert(workOrderErrorType);
+
+ databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ databaseWorkOrder.setUpdateTime(now);
+ baseMapper.updateById(databaseWorkOrder);
+ updateNum++;
+ // 鍚屾椂鏂板涓�涓繍缁村鐞嗕俊鎭紝琛ㄦ槑姝ゅ伐鍗曡璋冩暣
+ WorkOrderYwConditionRecord ywRecord = new WorkOrderYwConditionRecord();
+ ywRecord.setWorkOrderId(databaseWorkOrder.getId());
+ ywRecord.setCommitUser(1);
+ ywRecord.setYwCondition("鏁呴殰绫诲瀷鏇存柊锛屽伐鍗曠姸鎬佽皟鏁翠负寰呭鐞�");
+ ywRecord.setCreateTime(new Date());
+ workOrderYwConditionRecordMapper.insert(ywRecord);
+ }
+ } else {
+ workOrder.setCreateTime(new Date());
+ workOrder.setUpdateTime(new Date());
+// // 濡傛灉鎶ュ杩囷紝浣跨敤鏈�鏂版姤澶囩殑閿欒绫诲瀷
+// Report report = reportMapper.checkPointReported(workOrder.getSerialNumber());
+// if (Objects.nonNull(report)) {
+// workOrder.setErrorType(report.getErrorType());
+// }
+ waitAddList.add(workOrder);
+ }
+ }
+ if (CollectionUtils.isEmpty(waitAddList)) {
+ return Boolean.TRUE;
+ }
+ List<String> willAddSerialNumber = waitAddList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
+ List<YwPoint> pointList = new LambdaQueryChainWrapper<>(ywPointService.getBaseMapper())
+ .select(YwPoint::getUnitId, YwPoint::getSerialNumber, YwPoint::getImportantTag, YwPoint::getImportantTag, YwPoint::getProvinceTag, YwPoint::getImportantCommandImageTag)
+ .in(YwPoint::getSerialNumber, willAddSerialNumber)
+ .list();
+ Map<String, YwPoint> pointMapping = pointList.stream().collect(Collectors.toMap(YwPoint::getSerialNumber, point -> point));
+ // 鏌ュ嚭閲嶇偣鐐逛綅銆佹櫘閫氱偣浣嶇殑澶勭悊鏃堕棿
+ SysConfig important = configMapper.checkConfigKeyUnique("important.wordkorder.time");
+ SysConfig normal = configMapper.checkConfigKeyUnique("normal.wordkorder.alarm.time");
+ // 濡傛灉鍗冲皢鐢熸垚宸ュ崟锛屼絾鏄澶囧浗鏍囩爜鏌ヤ笉鍒扮偣浣嶏紝鍒欎笉娣诲姞锛�
+ List<WorkOrder> notAddList = new ArrayList<>();
+ for (WorkOrder workOrder : waitAddList) {
+ YwPoint point = pointMapping.get(workOrder.getSerialNumber());
+ if (Objects.isNull(point)) {
+ notAddList.add(workOrder);
+ continue;
+ }
+ workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
+ workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
+ if (point.getImportantTag() || point.getImportantCommandImageTag()) {
+ workOrder.setProcessingPeriod(Integer.valueOf(important.getConfigValue()));
+ } else {
+ workOrder.setProcessingPeriod(Integer.valueOf(normal.getConfigValue()));
+ }
+ }
+ waitAddList.removeAll(notAddList);
+ if (CollectionUtils.isEmpty(waitAddList)) {
+ return Boolean.TRUE;
+ }
+ this.saveBatch(waitAddList);
+ // 濡傛灉鏄洿鎺ヤ笅鍙戯紝娣诲姞涓嬪彂璁板綍
+ if (WorkOrderStatusEnum.DISTRIBUTED.equals(waitAddList.get(0).getStatus())) {
+ List<WorkOrderDistributeRecord> distributedRecordList = waitAddList.stream().map(item -> {
+ WorkOrderDistributeRecord workOrderDistributeRecord = new WorkOrderDistributeRecord();
+ workOrderDistributeRecord.setWorkOrderId(item.getId());
+ workOrderDistributeRecord.setDistributeWay(WorkOrderDistributeWayEnum.DIRECT_DISTRIBUTE);
+ workOrderDistributeRecord.setUserId(1L);
+ Date now = new Date();
+ workOrderDistributeRecord.setCreateTime(now);
+ workOrderDistributeRecord.setUpdateTime(now);
+ return workOrderDistributeRecord;
+ }).collect(Collectors.toList());
+ workOrderDistributeRecordMapper.insertBatch(distributedRecordList);
+ }
+ log.info("浼犲叆宸ュ崟鎬绘暟: {}锛屽疄闄呮坊鍔犲伐鍗曟暟锛歿}, 瀹為檯淇敼宸ュ崟鏁帮細{}", total, waitAddList.size(), updateNum);
+ return Boolean.TRUE;
+ }
/**
* 娣诲姞
@@ -84,6 +231,12 @@
entity.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
entity.setCreateTime(DateUtils.getNowDate());
entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
+ entity.setErrorType(String.join(",", form.getErrorType()));
+ List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType)).toList();
+ workOrderErrorTypeMapper.insertWorkOrderErrorTypeList(workOrderErrorTypes);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -99,10 +252,11 @@
public Result update(WorkOrderForm form) {
WorkOrder entity = baseMapper.selectById(form.getId());
-
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ Date now = new Date();
+ entity.setUpdateTime(now);
if (baseMapper.updateById(entity) > 0) {
return Result.ok("淇敼鎴愬姛");
}
@@ -132,7 +286,7 @@
notifyService.save(notify);
// 鍚屾鐐逛綅鐘舵��
if (form.getAuditingResult() == WorkOrderStatusEnum.AUDITING_SUCCESS) {
- ywPointService.updateRecovery(Collections.singletonList(workOrder.getPointId()), 0);
+ ywPointService.updateRecovery(Arrays.asList(workOrder.getSerialNumber()), 0);
}
return Result.ok("鎿嶄綔鎴愬姛");
}
@@ -197,6 +351,7 @@
workOrderYwConditionRecord.setCommitUser(SecurityUtils.getLoginUser().getUserId().intValue());
workOrderYwConditionRecord.setYwCondition(form.getYwCondition());
workOrderYwConditionRecord.setYwProofMaterials(form.getYwProofMaterials());
+ workOrderYwConditionRecord.setSysMsg(Boolean.FALSE);
workOrderYwConditionRecordMapper.insert(workOrderYwConditionRecord);
return Result.ok("鎿嶄綔鎴愬姛");
}
@@ -204,6 +359,11 @@
@Override
public Result selectYwConditionByYwId(Integer id) {
List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(id);
+ ywConditionList.stream().forEach(item -> {
+ if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) {
+ item.setCommitUserName("绯荤粺娑堟伅");
+ }
+ });
return Result.ok().data(ywConditionList);
}
@@ -261,6 +421,7 @@
public Result page(WorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
baseMapper.page(page, query);
+ page.getRecords().forEach(item -> item.setErrorType(ErrorTypeEnum.getEnumValue(item.getErrorType())));
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -268,11 +429,7 @@
public Result distributePage(DistributeWorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
baseMapper.distributePage(page, query);
- page.getRecords().stream().forEach(workOrder -> {
- if (StringUtils.hasText(workOrder.getPointTag()) && workOrder.getPointTag().contains(IMPORTANT)) {
- workOrder.setImportant(Boolean.TRUE);
- }
- });
+ page.getRecords().forEach(item -> item.setErrorType(ErrorTypeEnum.getEnumValue(item.getErrorType())));
return Result.ok().data(page).total(page.getTotal());
}
@@ -299,7 +456,7 @@
// 鏌ヨ绗﹀悎鏉′欢鐨勫伐鍗�
List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
- .select(WorkOrder::getId, WorkOrder::getPointId)
+ .select(WorkOrder::getSerialNumber, WorkOrder::getSerialNumber)
.eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
.eq(Objects.nonNull(data.getUnitId()), WorkOrder::getUnitId, data.getUnitId())
.eq(WorkOrder::getErrorType, data.getErrorType())
@@ -308,7 +465,7 @@
.last("limit " + data.getFastNumLimit())
.list();
List<Integer> ids = list.stream().map(WorkOrder::getId).toList();
- List<Integer> pointIds = list.stream().map(WorkOrder::getPointId).toList();
+ List<String> serialNumberList = list.stream().map(WorkOrder::getSerialNumber).toList();
if (ids.isEmpty()) { return Result.error("娌℃湁绗﹀悎鏉′欢鐨勫伐鍗�"); }
if (!getDistributeLock()) { return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�"); }
@@ -319,7 +476,7 @@
.update();
addDistributeRecord(ids, WorkOrderDistributeWayEnum.FAST_DISTRIBUTE);
// 鍚屾鐐逛綅鐘舵��
- ywPointService.updateRecovery(pointIds, 1);
+ ywPointService.updateRecovery(serialNumberList, 1);
return Result.ok("鎴愬姛涓嬪彂" + ids.size() + "鏉″伐鍗�");
} catch (Exception e) {
return Result.error("鎿嶄綔澶辫触");
@@ -352,8 +509,8 @@
.update();
addDistributeRecord(query.getIds(), distributeWayEnum);
// 鍚屾鐐逛綅鐘舵��
- List<Integer> pointIds = new LambdaQueryChainWrapper<>(baseMapper).select(WorkOrder::getPointId).in(WorkOrder::getId, query.getIds()).list().stream().map(WorkOrder::getPointId).toList();
- ywPointService.updateRecovery(pointIds, 1);
+ List<String> serialNumberList = new LambdaQueryChainWrapper<>(baseMapper).select(WorkOrder::getSerialNumber).in(WorkOrder::getId, query.getIds()).list().stream().map(WorkOrder::getSerialNumber).toList();
+ ywPointService.updateRecovery(serialNumberList, 1);
return Result.ok("鎴愬姛涓嬪彂" + query.getIds().size() + "鏉″伐鍗�");
} catch (Exception e) {
return Result.error("鎿嶄綔澶辫触");
@@ -368,7 +525,7 @@
*/
public synchronized Boolean getDistributeLock() {
if (Objects.isNull(redisCache.getCacheObject(DISTRIBUTE_LOCK_KEY))) {
- redisCache.setCacheObject(DISTRIBUTE_LOCK_KEY, "1");
+ redisCache.setCacheObject(DISTRIBUTE_LOCK_KEY, "1", 30, TimeUnit.SECONDS);
return true;
} else {
return false;
@@ -452,4 +609,63 @@
dataMap.put("pending", data3);
return dataMap;
}
+
+ @Override
+ public WorkOrderTotalVO workOrderTotal(DashboardQuery dashboardQuery) {
+ return baseMapper.workOrderTotal(dashboardQuery);
+ }
+
+ @Override
+ public List<WorkOrderRegionVO> workOrderRegion(DashboardQuery dashboardQuery) {
+ return baseMapper.workOrderRegion(dashboardQuery);
+ }
+
+
+ @Override
+ public String getFrameImgByDevice(String deviceId, String channelId) {
+ String url = String.format(this.rtspServer + "/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();
+ if (StringUtils.hasText(rtspUrl)) {
+ try {
+ // 鍒涘缓FFmpegFrameGrabber瀵硅薄
+ FFmpegFrameGrabber grabber = new FFmpegFrameGrabber(rtspUrl);
+ 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;
+ }
+ grabber.stop(); // 鍋滄鎹曡幏
+ grabber.release(); // 閲婃斁璧勬簮
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public List<DeviceInfoVO> hasErrorWorkOrderList() {
+ List<DeviceInfoVO> list = baseMapper.hasErrorWorkOrderList();
+ return list;
+ }
+
+ @Override
+ public void updateImgById(Integer workOrderId, String imgPath) {
+ new LambdaUpdateChainWrapper<>(baseMapper)
+ .eq(WorkOrder::getId, workOrderId)
+ .set(WorkOrder::getYwCheckCondition, imgPath);
+ }
}
--
Gitblit v1.8.0