From 58b691e9cfe1e5e1ae8a62c8b66f1995eaad0e9e Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 27 二月 2025 15:07:32 +0800
Subject: [PATCH] 导出osd问题 以及缺少小时改分钟
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 455 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 287 insertions(+), 168 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 1657856..8a08b68 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,7 +1,6 @@
package com.ycl.platform.service.impl;
import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -12,9 +11,9 @@
import com.ycl.config.PlatformConfig;
import com.ycl.exception.ServiceException;
import com.ycl.platform.domain.entity.*;
-import com.ycl.platform.domain.excel.PointExport;
import com.ycl.platform.domain.form.*;
import com.ycl.platform.domain.query.*;
+import com.ycl.platform.domain.result.SYS.TMonitorResult;
import com.ycl.platform.domain.vo.*;
import com.ycl.platform.domain.vo.screen.ScreenWorkOrderVO;
import com.ycl.platform.domain.vo.screen.WorkOrderRegionVO;
@@ -36,6 +35,7 @@
import com.ycl.utils.http.HttpUtils;
import com.ycl.utils.redis.RedisCache;
import com.ycl.utils.uuid.IdUtils;
+import constant.ApiConstants;
import constant.Constants;
import constant.RedisConstant;
import enumeration.ErrorType;
@@ -65,6 +65,7 @@
import java.time.ZoneId;
import java.util.*;
import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -79,6 +80,9 @@
public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
private final YwPointService ywPointService;
+ private final YwPointMapper ywPointMapper;
+ private final TMonitorMapper monitorMapper;
+ private final DynamicColumnMapper dynamicColumnMapper;
private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper;
private final WorkOrderAuditingRecordService workOrderAuditingRecordService;
private final WorkOrderYwConditionRecordMapper workOrderYwConditionRecordMapper;
@@ -86,10 +90,10 @@
private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper;
private final WorkOrderErrorTypeServiceImpl workOrderErrorTypeService;
private final WorkOrderErrorTypeMapper workOrderErrorTypeMapper;
+ private final WorkOrderWhiteMapper workOrderWhiteMapper;
private final SysConfigMapper configMapper;
private final ReportMapper reportMapper;
private final WorkOrderCheckImgMapper workOrderCheckImgMapper;
- private final WorkOrderWhiteMapper workOrderWhiteMapper;
private final DeviceInfoMapper deviceInfoMapper;
private final ApplicationContext applicationContext;
@Value("${rtsp.server:http://127.0.0.1:7788}")
@@ -109,19 +113,12 @@
}
@Transactional(rollbackFor = Exception.class)
- public Boolean batchAddWorkOrder(List<WorkOrder> workOrderList){
+ public Boolean batchAddWorkOrder(List<WorkOrder> workOrderList) {
int total = workOrderList.size();
- // 鏌ヨ鍑虹櫧鍚嶅崟鍒楄〃
- List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());
- // 閬嶅巻宸ュ崟鍒楄〃锛屽垽鏂槸鍚﹀湪鐧藉悕鍗曚腑
- workOrderList = workOrderList.stream().filter(item -> !serialNumbers.contains(item.getSerialNumber()))
- .collect(Collectors.toList());
+ //娓呯悊鏁版嵁
workOrderList = workOrderList.stream().filter(item -> {
return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && !CollectionUtils.isEmpty(item.getErrorTypeList());
}).collect(Collectors.toList());
- if (CollectionUtils.isEmpty(workOrderList)) {
- return Boolean.TRUE;
- }
// 鏍规嵁鍥芥爣鐮佸幓閲�
workOrderList = workOrderList.stream()
.collect(Collectors.toMap(
@@ -129,6 +126,12 @@
p -> p,
(existing, replacement) -> existing // 鍐茬獊鏃朵繚鐣欑涓�涓�
)).values().stream().collect(Collectors.toList());
+ //妫�鏌ョ櫧鍚嶅崟
+ workOrderList = checkWhite(workOrderList);
+
+ if (CollectionUtils.isEmpty(workOrderList)) {
+ return Boolean.TRUE;
+ }
List<String> serialNumberList = workOrderList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
// 鏌ュ嚭鏁版嵁搴撲腑鍥芥爣鐮佸搴旂殑鏈畬鎴愮殑宸ュ崟
List<WorkOrder> inDatabaseWorkOrderList = baseMapper.getNotFinishedWorkOrders(serialNumberList);
@@ -171,20 +174,20 @@
}
}
//閬垮厤浠ｄ笅鍙戠殑宸ュ崟鐩存帴鍙樻垚涓嬪彂
- if(!databaseWorkOrder.getStatus().equals(WorkOrderStatusEnum.WAIT_DISTRIBUTE)) {
+ if (!databaseWorkOrder.getStatus().equals(WorkOrderStatusEnum.WAIT_DISTRIBUTE)) {
databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ // 鍚屾椂鏂板涓�涓繍缁村鐞嗕俊鎭紝琛ㄦ槑姝ゅ伐鍗曡璋冩暣
+ WorkOrderYwConditionRecord ywRecord = new WorkOrderYwConditionRecord();
+ ywRecord.setWorkOrderNo(databaseWorkOrder.getWorkOrderNo());
+ ywRecord.setCommitUser(1);
+ ywRecord.setYwCondition("鏁呴殰绫诲瀷鏇存柊锛屽伐鍗曠姸鎬佽皟鏁翠负寰呭鐞�");
+ ywRecord.setCreateTime(new Date());
+ ywRecord.setSysMsg(Boolean.TRUE);
+ willAddMsg.add(ywRecord);
}
databaseWorkOrder.setUpdateTime(now);
willUpdateStatusWorkOrderList.add(databaseWorkOrder);
updateNum++;
- // 鍚屾椂鏂板涓�涓繍缁村鐞嗕俊鎭紝琛ㄦ槑姝ゅ伐鍗曡璋冩暣
- WorkOrderYwConditionRecord ywRecord = new WorkOrderYwConditionRecord();
- ywRecord.setWorkOrderNo(databaseWorkOrder.getWorkOrderNo());
- ywRecord.setCommitUser(1);
- ywRecord.setYwCondition("鏁呴殰绫诲瀷鏇存柊锛屽伐鍗曠姸鎬佽皟鏁翠负寰呭鐞�");
- ywRecord.setCreateTime(new Date());
- ywRecord.setSysMsg(Boolean.TRUE);
- willAddMsg.add(ywRecord);
}
} else {
workOrder.setCreateTime(new Date());
@@ -213,7 +216,7 @@
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)
+ .select(YwPoint::getUnitId, YwPoint::getSerialNumber, YwPoint::getImportantTag, YwPoint::getImportantTag, YwPoint::getImportantCommandImageTag)
.in(YwPoint::getSerialNumber, willAddSerialNumber)
.eq(YwPoint::getExamineStatus, Boolean.TRUE)
.isNotNull(YwPoint::getUnitId)
@@ -282,7 +285,7 @@
workOrderErrorType.setErrorName(errorType);
waitAddErrorTypeList.add(workOrderErrorType);
}
- log.info("鍗冲皢鐢熸垚鐨勫伐鍗�:{}",workOrder);
+ log.info("鍗冲皢鐢熸垚鐨勫伐鍗�:{}", workOrder);
}
redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum);
redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId);
@@ -311,6 +314,8 @@
log.info("浼犲叆宸ュ崟鎬绘暟: {}锛屽疄闄呮坊鍔犲伐鍗曟暟锛歿}, 瀹為檯淇敼宸ュ崟鏁帮細{}", total, waitAddList.size(), updateNum);
return Boolean.TRUE;
}
+
+
/**
* 娣诲姞
*
@@ -319,31 +324,97 @@
*/
@Override
public Result add(WorkOrderForm form) {
- //鏌edis浠婃棩宸ュ崟鏁伴噺
- 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 ? 0 : (Integer) redisNum;
- workOrderNum++;
- redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum);
- redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId);
- } else {
- return Result.error("宸ュ崟姝ｅ湪娣诲姞锛岃绋嶅悗鍐嶈瘯");
+ //妫�鏌ョ櫧鍚嶅崟
+ List<WorkOrder> data = new ArrayList<>();
+ WorkOrder workOrder = WorkOrderForm.getEntityByForm(form, null);
+ data.add(workOrder);
+ //鏍￠獙鐧藉悕鍗曞苟鎺掗櫎鍦ㄧ櫧鍚嶅崟鐨勬晠闅滅被鍨�
+ data = checkWhite(data);
+ if (CollectionUtils.isEmpty(data)) {
+ return Result.error("璇ヨ澶囩殑鏁呴殰绫诲瀷鍦ㄧ櫧鍚嶅崟涓紝涓嶈兘娣诲姞宸ュ崟");
}
- WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
- // 鏌ヨ鍑虹櫧鍚嶅崟鍒楄〃
- List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());
- // 閬嶅巻宸ュ崟鍒楄〃锛屽垽鏂槸鍚﹀湪鐧藉悕鍗曚腑
- if (serialNumbers.contains(entity.getSerialNumber())){
- return Result.error("璇ヨ澶囧湪鐧藉悕鍗曚腑锛屼笉鑳芥坊鍔犲伐鍗�");
- }else {
+ WorkOrder entity = data.get(0);
+ String serialNumber = entity.getSerialNumber();
+ Date now = new Date();
+ List<WorkOrder> inDatabaseWorkOrderList = baseMapper.getNotFinishedWorkOrders(Arrays.asList(serialNumber));
+ inDatabaseWorkOrderList.stream().forEach(item -> {
+ if (StringUtils.hasText(item.getErrorType())) {
+ item.setErrorTypeList(List.of(item.getErrorType().split(",")));
+ } else {
+ item.setErrorTypeList(new ArrayList<>(1));
+ }
+ });
+ // 鍥犳晠闅滅被鍨嬩笉涓�鑷磋�岃鏇存柊鐘舵�佺殑宸ュ崟
+ List<WorkOrder> willUpdateStatusWorkOrderList = new ArrayList<>(48);
+ // 鏇存敼宸ュ崟绫诲瀷鑰岃澧炲姞鐨勭郴缁熻繍缁村鐞嗕俊鎭�
+ List<WorkOrderYwConditionRecord> willAddMsg = new ArrayList<>(48);
+ // 鍗冲皢瑕佹坊鍔犵殑閿欒绫诲瀷
+ List<WorkOrderErrorType> willAddErrorType = new ArrayList<>(96);
+ if (!CollectionUtils.isEmpty(inDatabaseWorkOrderList)) {
+ WorkOrder workOrderInDB = inDatabaseWorkOrderList.get(0);
+ List<String> errorNameList = workOrderInDB.getErrorTypeList();
+ List<String> errorTypes = entity.getErrorTypeList();
+ if (errorNameList.containsAll(errorTypes)) {
+ return Result.error("宸叉湁鍚岀鏁呴殰绫诲瀷宸ュ崟");
+ } else {
+ for (String errorType : errorTypes) {
+ if (!errorNameList.contains(errorType)) {
+ // 閿欒绫诲瀷涓嶄竴鏍凤紝灏辨柊澧炰竴涓敊璇被鍨嬶紝骞朵笖閲嶇疆宸ュ崟鐘舵�佷负寰呭鐞�
+ WorkOrderErrorType workOrderErrorType = new WorkOrderErrorType();
+ workOrderErrorType.setWorkOrderNo(workOrderInDB.getWorkOrderNo());
+ workOrderErrorType.setCreateTime(now);
+ workOrderErrorType.setUpdateTime(now);
+ workOrderErrorType.setErrorName(errorType);
+ willAddErrorType.add(workOrderErrorType);
+ }
+ }
+ //閬垮厤浠ｄ笅鍙戠殑宸ュ崟鐩存帴鍙樻垚涓嬪彂
+ if (!workOrderInDB.getStatus().equals(WorkOrderStatusEnum.WAIT_DISTRIBUTE)) {
+ workOrderInDB.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ // 鍚屾椂鏂板涓�涓繍缁村鐞嗕俊鎭紝琛ㄦ槑姝ゅ伐鍗曡璋冩暣
+ WorkOrderYwConditionRecord ywRecord = new WorkOrderYwConditionRecord();
+ ywRecord.setWorkOrderNo(workOrderInDB.getWorkOrderNo());
+ ywRecord.setCommitUser(1);
+ ywRecord.setYwCondition("鏁呴殰绫诲瀷鏇存柊锛屽伐鍗曠姸鎬佽皟鏁翠负寰呭鐞�");
+ ywRecord.setCreateTime(new Date());
+ ywRecord.setSysMsg(Boolean.TRUE);
+ willAddMsg.add(ywRecord);
+ }
+ workOrderInDB.setUpdateTime(now);
+ willUpdateStatusWorkOrderList.add(workOrderInDB);
+ //淇敼鏁呴殰绫诲瀷
+ if (willAddErrorType.size() > 0) {
+ workOrderErrorTypeService.getBaseMapper().addMany(willAddErrorType);
+ }
+ //澧炲姞杩愮淮鎯呭喌
+ if (willAddMsg.size() > 0) {
+ workOrderYwConditionRecordMapper.insertMany(willAddMsg);
+ }
+ //鏇存敼宸ュ崟鐘舵��
+ if (willUpdateStatusWorkOrderList.size() > 0) {
+ this.baseMapper.updateMany(willUpdateStatusWorkOrderList);
+ }
+ }
+ return Result.ok("娣诲姞鎴愬姛");
+ } else {
+ //鏁版嵁搴撴病鏈夋鍦ㄨ繘琛岀殑宸ュ崟
+ //鏌edis浠婃棩宸ュ崟鏁伴噺
+ 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 ? 0 : (Integer) redisNum;
+ workOrderNum++;
+ redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum);
+ redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId);
+ } else {
+ return Result.error("宸ュ崟姝ｅ湪娣诲姞锛岃绋嶅悗鍐嶈瘯");
+ }
entity.setCreateTime(DateUtils.getNowDate());
entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
- Date now = new Date();
entity.setCreateTime(now);
entity.setUpdateTime(now);
entity.setWorkOrderNo(IdUtils.workOrderNO(now, String.format("%05d", workOrderNum)));
@@ -352,10 +423,12 @@
workOrderErrorTypeService.getBaseMapper().insertWorkOrderErrorTypeList(workOrderErrorTypes);
if (baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
+ } else {
+ return Result.error("娣诲姞澶辫触");
}
- return Result.error("娣诲姞澶辫触");
}
}
+
/**
* 淇敼
@@ -399,10 +472,25 @@
UrgentLevelEnum.WARNING,
workOrder.getWorkOrderNo());
notifyService.save(notify);
+ List<WorkOrderVO> workOrderVOS = workOrderErrorTypeMapper.getErrorListByNumbers(Arrays.asList(workOrder.getWorkOrderNo()));
+
// 鍚屾鐐逛綅鐘舵��
if (form.getAuditingResult() == WorkOrderStatusEnum.AUDITING_SUCCESS) {
ywPointService.updateRecovery(Collections.singletonList(workOrder.getSerialNumber()), 0);
+ //濡傛灉宸ュ崟涓虹绾垮伐鍗曢偅涔堜慨鏀圭偣浣峱ingOnline涓哄湪绾�
+ if (!CollectionUtils.isEmpty(workOrderVOS)) {
+ List<String> ips = new ArrayList<>();
+ for (WorkOrderVO workOrderVO : workOrderVOS) {
+ if(ErrorType.DEVICE_OFFLINE.getValue().equals(workOrderVO.getErrorType())){
+ ips.add(workOrderVO.getIp());
+ }
+ }
+ if(!CollectionUtils.isEmpty(ips)) {
+ monitorMapper.batchUpdateOnline(ips, new Date(), ApiConstants.UY_OnlineSite_Online);
+ }
+ }
}
+
return Result.ok("鎿嶄綔鎴愬姛");
}
@@ -442,11 +530,30 @@
workOrder.getWorkOrderNo());
notifies.add(notify);
}
+ notifyService.saveBatch(notifies);
// 鍚屾鐐逛綅鐘舵��
if (form.getAuditingResult() == WorkOrderStatusEnum.AUDITING_SUCCESS) {
ywPointService.updateRecovery(serialNumbers, 0);
+ //绛涢�夊嚭绂荤嚎宸ュ崟ip骞朵慨鏀瑰湪绾跨姸鎬�
+ if (!CollectionUtils.isEmpty(serialNumbers)) {
+ Map<String, List<String>> errorTypes = workOrderErrorTypeMapper.getErrorListByNumbers(workOrderNoList).stream().collect(Collectors.groupingBy(
+ WorkOrderVO::getIp,
+ Collectors.mapping(
+ WorkOrderVO::getErrorType,
+ Collectors.toList()
+ )
+ ));
+ List<String> ips = new ArrayList<>();
+ errorTypes.forEach((key, value) -> {
+ if (!CollectionUtils.isEmpty(value) && value.contains(ErrorType.DEVICE_OFFLINE.getValue())) {
+ ips.add(key);
+ }
+ });
+ if(!CollectionUtils.isEmpty(ips)) {
+ monitorMapper.batchUpdateOnline(ips, new Date(), ApiConstants.UY_OnlineSite_Online);
+ }
+ }
}
- notifyService.saveBatch(notifies);
return Result.ok("鎿嶄綔鎴愬姛");
}
@@ -488,7 +595,7 @@
// 鍥芥爣璁惧鐨勭紪鐮佸氨鏄彇瑙嗛娴佺殑璁惧缂栫爜锛屽浗鏍囪澶囧氨涓�涓�傚浗鏍囪澶囩殑姣忎竴涓�氶亾浠ｈ〃涓�涓憚鍍忓ご锛屼篃灏辨槸璁惧id鏄彇娴佺殑閫氶亾id
String frameImg = null;
try {
- log.info("鍥芥爣骞冲彴:{},璁惧缂栫爜:{},宸ュ崟鍙�:{}",gbDevices.get(0).getDeviceId(), workOrder.getSerialNumber(), workOrder.getWorkOrderNo());
+ log.info("鍥芥爣骞冲彴:{},璁惧缂栫爜:{},宸ュ崟鍙�:{}", gbDevices.get(0).getDeviceId(), workOrder.getSerialNumber(), workOrder.getWorkOrderNo());
frameImg = this.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), workOrder.getSerialNumber(), workOrder.getWorkOrderNo());
} catch (Exception e) {
e.printStackTrace();
@@ -501,11 +608,12 @@
workOrderCheckImgMapper.insert(img);
}
}
+
@Override
public List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo) {
List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo);
ywConditionList.stream().forEach(item -> {
- if(item.getUserId().equals(1)){
+ if (item.getUserId().equals(1)) {
item.setUnitName("绠＄悊鍛�");
}
if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) {
@@ -583,11 +691,25 @@
@Override
public Result page(WorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
- if(query.getUnitId()==null) {
+ if (query.getUnitId() == null) {
query.setUnitId(SecurityUtils.getUnitId());
}
- if(query.getStart()!=null) query.setStart(DateUtils.getDayStart(query.getStart()));
- if(query.getEnd()!=null) query.setEnd(DateUtils.getDayEnd(query.getEnd()));
+ if (query.getStart() != null) query.setStart(DateUtils.getDayStart(query.getStart()));
+ if (query.getEnd() != null) query.setEnd(DateUtils.getDayEnd(query.getEnd()));
+ if (query.getErrorType() != null) {
+ List<String> errorTypeList = new ArrayList<>();
+ errorTypeList.add(query.getErrorType());
+ if (ErrorType.ABNORMAL_PIC.getValue().equals(query.getErrorType())) {
+ //List娣诲姞涔嬪墠鍑犵宸ュ崟绫诲瀷
+ errorTypeList.add(ErrorType.SIGNAL_LOSS.getValue());
+ errorTypeList.add(ErrorType.SCREEN_COLOR_DEVIATION.getValue());
+ errorTypeList.add(ErrorType.SNOW_STORM.getValue());
+ errorTypeList.add(ErrorType.STRIPE_INTERFERENCE.getValue());
+ errorTypeList.add(ErrorType.SCREEN_OCCLUSION.getValue());
+ errorTypeList.add(ErrorType.ABNORMAL_CLARITY.getValue());
+ }
+ query.setErrorTypeList(errorTypeList);
+ }
baseMapper.page(page, query);
if (!CollectionUtils.isEmpty(page.getRecords())) {
page.getRecords().stream().forEach(item -> {
@@ -616,8 +738,8 @@
@Override
public Result distributePage(DistributeWorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
- if(query.getStart()!=null) query.setStart(DateUtils.getDayStart(query.getStart()));
- if(query.getEnd()!=null) query.setEnd(DateUtils.getDayEnd(query.getEnd()));
+ if (query.getStart() != null) query.setStart(DateUtils.getDayStart(query.getStart()));
+ if (query.getEnd() != null) query.setEnd(DateUtils.getDayEnd(query.getEnd()));
baseMapper.distributePage(page, query);
return Result.ok().data(page).total(page.getTotal());
}
@@ -687,6 +809,7 @@
return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�");
}
try {
+ //杩欐槸鍏ㄩ儴涓嬪彂
if (query.getWorkOrderNOList().isEmpty()) {
query.setWorkOrderNOList(new LambdaQueryChainWrapper<>(baseMapper)
.eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
@@ -845,11 +968,11 @@
@Override
public String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo) throws Exception {
String url = String.format(this.rtspServer + "/api/play/start/img/%s/%s", deviceId, channelId);
- log.info("璁块棶璺緞{}",url);
+ log.info("璁块棶璺緞{}", url);
String result = HttpUtils.sendGet(url);
log.info("鎷垮埌鍙栨祦鍥剧墖鍝嶅簲缁撴灉锛�" + result);
WVPResult wvpResult = JSON.parseObject(result, WVPResult.class);
- if(wvpResult.getCode() == 0) {
+ if (wvpResult.getCode() == 0) {
Object imgUrl = (Object) wvpResult.getData();
imgUrl = Objects.isNull(imgUrl) ? "" : imgUrl;
log.info("鎷垮埌鍙栨祦鍥剧墖锛�" + imgUrl);
@@ -906,7 +1029,7 @@
}
@Override
- public void saveFrameImgByDevice (String deviceId, String channelId, String workOrderNo){
+ 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);
@@ -967,13 +1090,13 @@
}
@Override
- public List<DeviceInfoVO> hasErrorWorkOrderList (Date start, Date end){
+ public List<DeviceInfoVO> hasErrorWorkOrderList(Date start, Date end) {
List<DeviceInfoVO> list = baseMapper.hasErrorWorkOrderList(start, end);
return list;
}
@Override
- public void updateImgById (Integer workOrderId, String imgPath){
+ public void updateImgById(Integer workOrderId, String imgPath) {
new LambdaUpdateChainWrapper<>(baseMapper)
.eq(WorkOrder::getId, workOrderId)
.set(WorkOrder::getYwCheckResult, imgPath)
@@ -981,7 +1104,7 @@
}
@Override
- public Result processImg (String workOrderNo){
+ public Result processImg(String workOrderNo) {
WorkOrder workOrder = new LambdaQueryChainWrapper<>(baseMapper)
.eq(WorkOrder::getWorkOrderNo, workOrderNo)
.one();
@@ -1022,7 +1145,7 @@
}
@Override
- public Result detailByNo (String workOrderNo){
+ public Result detailByNo(String workOrderNo) {
WorkOrderDetailVO workOrder = baseMapper.detailByNo(workOrderNo);
// 鏄惁鎶ュ
boolean hasReport = new LambdaQueryChainWrapper<>(reportMapper)
@@ -1043,119 +1166,105 @@
return Result.ok().data(workOrder);
}
+ /**
+ * 宸ュ崟瀵煎嚭鐨勯�昏緫
+ * 鏍囩锛氬悓涓�涓猧p鏍囩鍚堝湪涓�璧凤紝閽堝绂荤嚎宸ュ崟锛坕p鐩稿悓灏变笉浼氱敓鎴愬伐鍗曪級锛屾柟渚胯繍缁村鐞�
+ *
+ * @param query
+ * @return
+ */
@Override
- public List<WorkOrderVO> export (WorkOrderExportQuery query){
- if(query.getUnitId()==null) {
+ public List<WorkOrderVO> export(WorkOrderExportQuery query) {
+ if (query.getUnitId() == null) {
query.setUnitId(SecurityUtils.getUnitId());
}
if (query.getStart() != null) query.setStart(query.getStart() + " 00:00:00");
if (query.getEnd() != null) query.setEnd(query.getEnd() + " 23:59:59");
-
- return baseMapper.export(query);
- }
-
- /**
- * 宸ュ崟鐧藉悕鍗曞垪琛�
- *
- * @param query 鏌ヨ
- * @return {@link List }<{@link WorkOrderWhite }>
- * @author
- */
- @Override
- public Result selectWorkOrderWhiteList(WorkOrderWhiteQuery query) {
- IPage<WorkOrderWhite> page = PageUtil.getPage(query, WorkOrderWhite.class);
- workOrderWhiteMapper.page(page, query);
- List<WorkOrderWhite> records = page.getRecords();
- records.forEach(white-> {
- List<String> errorTextList = new ArrayList<>();
- List<String> errorTypeList = JSONArray.parseArray(white.getErrorType(), String.class);
- errorTypeList.forEach(error->{
- String errorText = ErrorType.getDescriptionByValue(error);
- errorTextList.add(errorText);
- });
- white.setErrorType(String.join(",", errorTextList));
- });
- return Result.ok().data(records).total(page.getTotal());
- }
-
- /**
- * 娣诲姞宸ュ崟鐧藉悕鍗�
- *
- * @param workOrderWhite 鐧借壊宸ュ崟
- * @return {@link Result }
- * @author
- */
- @Override
- public Result addWorkOrderWhite(WorkOrderWhite workOrderWhite) {
- // 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄨ鐧藉悕鍗�
- WorkOrderWhite flag = workOrderWhiteMapper.selectBySerialNumber(workOrderWhite.getSerialNumber());
- if (flag != null) {
- return Result.error("璇ヨ澶囧凡瀛樺湪鐧藉悕鍗�");
- } else {
- List<String> errorTypeList = workOrderWhite.getErrorTypeList();
- workOrderWhite.setErrorType(JSONArray.toJSONString(errorTypeList));
- workOrderWhite.setCreateBy(SecurityUtils.getUsername());
- workOrderWhiteMapper.insert(workOrderWhite);
- return Result.ok();
+ if (query.getErrorType() != null) {
+ List<String> errorTypeList = new ArrayList<>();
+ errorTypeList.add(query.getErrorType());
+ if (ErrorType.ABNORMAL_PIC.getValue().equals(query.getErrorType())) {
+ //List娣诲姞涔嬪墠鍑犵宸ュ崟绫诲瀷
+ errorTypeList.add(ErrorType.SIGNAL_LOSS.getValue());
+ errorTypeList.add(ErrorType.SCREEN_COLOR_DEVIATION.getValue());
+ errorTypeList.add(ErrorType.SNOW_STORM.getValue());
+ errorTypeList.add(ErrorType.STRIPE_INTERFERENCE.getValue());
+ errorTypeList.add(ErrorType.SCREEN_OCCLUSION.getValue());
+ errorTypeList.add(ErrorType.ABNORMAL_CLARITY.getValue());
+ }
+ query.setErrorTypeList(errorTypeList);
}
- }
- /**
- * 淇敼宸ュ崟鐧藉悕鍗�
- *
- * @param workOrderWhite 鐧借壊宸ュ崟
- * @return {@link Result }
- * @author
- */
- @Override
- public Result updateWorkOrderWhite(WorkOrderWhite workOrderWhite) {
- WorkOrderWhite white = workOrderWhiteMapper.selectBySerialNumber(workOrderWhite.getSerialNumber());
- workOrderWhite.setId(white.getId());
- List<String> errorTypeList = workOrderWhite.getErrorTypeList();
- workOrderWhite.setErrorType(JSONArray.toJSONString(errorTypeList));
- workOrderWhiteMapper.updateById(workOrderWhite);
- return Result.ok();
- }
- /**
- * 鎵归噺鍒犻櫎宸ュ崟鐧藉悕鍗�
- *
- * @param ids ids
- * @author
- */
- @Override
- public Result batchDeleteWorkOrderWhite(List<String> ids) {
- workOrderWhiteMapper.batchDelete(ids);
- return Result.ok();
- }
-
- /**
- * 鎵归噺瀵煎叆鐧藉悕鍗�
- *
- * @param dataList 鏁版嵁鍒楄〃
- * @author
- */
- @Override
- public void batchImportWhite(List<PointExport> dataList) {
-// // 鑾峰緱鎵�鏈夐渶瑕佹柊澧炵殑鐧藉悕鍗曞璞�
-// List<WorkOrderWhite> whitelist = dataList.stream().map(pointExport ->
-// new WorkOrderWhite(pointExport.getSerialNumber(), pointExport.getPointName(), SecurityUtils.getUsername()))
-// .collect(Collectors.toList());
-// // 鑾峰緱鎵�鏈夊凡瀛樺湪鐨勭櫧鍚嶅崟璁惧缂栫爜
-// List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());
-// // 绛涢�夊嚭鏂板銆佷慨鏀圭殑鐧藉悕鍗曞璞�
-// List<WorkOrderWhite> updateWhiteList = whitelist.stream().filter(white -> serialNumbers.contains(white.getSerialNumber())).collect(Collectors.toList());
-// List<WorkOrderWhite> insertWhiteList = whitelist.stream().filter(white ->!serialNumbers.contains(white.getSerialNumber())).collect(Collectors.toList());
-// // 鏂板/淇敼鐧藉悕鍗曡澶囪褰�
-// updateWhiteList.stream().forEach(white -> workOrderWhiteMapper.updateBySerialNumber(white));
-// insertWhiteList.stream().forEach(white -> workOrderWhiteMapper.insert(white));
+ List<WorkOrderVO> export = baseMapper.export(query);
+ if (CollectionUtils.isEmpty(export)) return new ArrayList<WorkOrderVO>();
+ List<String> ips = export.stream().map(WorkOrderVO::getIp).collect(Collectors.toList());
+ //鏌ュ嚭鐩稿悓ip鐨勮澶囥�佸苟鏌ュ嚭鏍囩
+ List<TMonitorResult> monitorVOS = monitorMapper.getByIp(ips);
+ //鑾峰彇鍔ㄦ�佸垪鏁版嵁
+ List<Integer> pointIds = monitorVOS.stream().map(TMonitorResult::getPointId).collect(Collectors.toList());
+ List<DynamicColumnVO> dynamics = dynamicColumnMapper.getDynamicsByIds("t_yw_point", pointIds);
+ //琛ュ厖鍔ㄦ�佸垪鏁版嵁
+ if (!CollectionUtils.isEmpty(dynamics)) {
+ Map<Integer, List<DynamicColumnVO>> map = dynamics.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefId));
+ for (TMonitorResult tMonitorResult : monitorVOS) {
+ Integer pointId = tMonitorResult.getPointId();
+ tMonitorResult.setDynamicColumnList(map.get(pointId));
+ }
+ }
+ export.forEach(result -> {
+ StringBuilder dynamicTag = new StringBuilder("");
+ Boolean provinceTagVideo = false;
+ Boolean provinceTagCar = false;
+ Boolean provinceTagFace = false;
+ Boolean importantTag = false;
+ Boolean importantCommandImageTag = false;
+ Boolean deptTag = false;
+ List<String> dynamicTags = new ArrayList<>();
+ for (TMonitorResult tagVO : monitorVOS) {
+ //鐪佸巺鏍囩閫氳繃ip鍒ゆ柇 (杩愮淮瑕佹眰)
+ if (tagVO.getIp().equals(result.getIp())) {
+ if (tagVO.getProvinceTagVideo()) provinceTagVideo = true;
+ if (tagVO.getProvinceTagCar()) provinceTagCar = true;
+ if (tagVO.getProvinceTagFace()) provinceTagFace = true;
+ if (tagVO.getImportantTag()) importantTag = true;
+ if (tagVO.getImportantCommandImageTag()) importantCommandImageTag = true;
+ if (tagVO.getDeptTag()) deptTag = true;
+ }
+ //鍔ㄦ�佸垪鏍规嵁鍥芥爣鍒ゆ柇
+ if (tagVO.getNo().equals(result.getSerialNumber())) {
+ //鍔ㄦ�佸垪澶勭悊鍔犲湪鏍囩閲�
+ if (!CollectionUtils.isEmpty(tagVO.getDynamicColumnList())) {
+ List<DynamicColumnVO> dynamicColumnList = tagVO.getDynamicColumnList();
+ for (DynamicColumnVO dynamicColumnVO : dynamicColumnList) {
+ if (!dynamicTags.contains(dynamicColumnVO.getColumnValue()))
+ dynamicTags.add(dynamicColumnVO.getColumnValue());
+ }
+ }
+ }
+ }
+ for (String tag : dynamicTags) {
+ dynamicTag.append(tag).append("銆�");
+ }
+ StringBuilder tag = new StringBuilder("" + (provinceTagVideo ? "鐪佸巺瑙嗛銆�" : "") + (provinceTagCar ? "鐪佸巺杞﹁締銆�" : "") + (provinceTagFace ? "鐪佸巺浜鸿劯銆�" : "") + (importantTag ? "閲嶇偣鐐逛綅銆�" : "") + (importantCommandImageTag ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") + (deptTag ? "閮ㄧ骇銆�" : ""));
+ if (tag.toString().endsWith("銆�")) {
+ tag = new StringBuilder(tag.substring(0, tag.length() - 1));
+ }
+ if (dynamicTag.toString().endsWith("銆�")) {
+ dynamicTag = new StringBuilder(dynamicTag.substring(0, dynamicTag.length() - 1));
+ }
+ result.setTag(tag.toString());
+ result.setDynamicTag(dynamicTag.toString());
+ });
+ return export;
}
/**
* 妫�娴嬪伐鍗曟寜閽�
+ *
* @param workOrderNo
* @return
*/
@Override
- public Result checkImage(String workOrderNo,String serialNumber) {
+ public Result checkImage(String workOrderNo, String serialNumber) {
// 鏌ュ嚭鍥芥爣璁惧锛屽氨涓�鏉℃暟鎹�
List<DeviceInfo> gbDevices = new LambdaQueryChainWrapper<>(deviceInfoMapper)
.orderByDesc(DeviceInfo::getUpdateTime)
@@ -1163,7 +1272,7 @@
.list();
if (!CollectionUtils.isEmpty(gbDevices)) {
try {
- String imgUrl = this.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), serialNumber,workOrderNo);
+ String imgUrl = this.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), serialNumber, workOrderNo);
if (StringUtils.hasText(imgUrl)) {
WorkOrderCheckImg img = new WorkOrderCheckImg();
img.setWorkOrderNo(workOrderNo);
@@ -1182,7 +1291,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Result batchDeleteWorkOrder(List<String> workOrderNos) {
- if(!CollectionUtils.isEmpty(workOrderNos)) {
+ if (!CollectionUtils.isEmpty(workOrderNos)) {
//鍒犻櫎宸ュ崟瀹℃牳璁板綍
workOrderAuditingRecordMapper.delete(new QueryWrapper<WorkOrderAuditingRecord>().in("work_order_no", workOrderNos));
//鍒犻櫎宸ュ崟鍥剧墖璁板綍
@@ -1248,12 +1357,22 @@
return Result.ok().data(results);
}
- @Override
- public Result selectWorkOrderWhiteDetail(Integer id) {
- WorkOrderWhite workOrderWhite = workOrderWhiteMapper.getById(id);
- List<String> errorList = JSONArray.parseArray(workOrderWhite.getErrorType(), String.class);
- workOrderWhite.setErrorTypeList(errorList);
- return Result.ok().data(workOrderWhite);
+ //鐧藉悕鍗曟牎楠�
+ private List<WorkOrder> checkWhite(List<WorkOrder> workOrderList) {
+ // 鏌ヨ鍑虹櫧鍚嶅崟鍒楄〃
+ Map<String, WorkOrderWhite> whiteMap = workOrderWhiteMapper.selectList().stream().collect(Collectors.toMap(WorkOrderWhite::getSerialNumber, Function.identity()));
+ workOrderList = workOrderList.stream()
+ .filter(workOrder -> {
+ List<String> errorTypeList = workOrder.getErrorTypeList();
+ WorkOrderWhite white = whiteMap.get(workOrder.getSerialNumber());
+ if (white != null) {
+ List<String> whiteErrorListSet = Arrays.asList(white.getErrorType().split(","));
+ errorTypeList.removeIf(whiteErrorListSet::contains);
+ }
+ return !errorTypeList.isEmpty(); // 鍙繚鐣� errorTypeList 闈炵┖鐨� WorkOrder
+ })
+ .collect(Collectors.toList());
+ return workOrderList;
}
--
Gitblit v1.8.0