From cb415813de667096290d6bd0f924f5b523104117 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 10 十一月 2025 17:41:04 +0800
Subject: [PATCH] 报备工单bug修改，定时任务在线问题修改新增导出扣分明细功能
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 870 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 705 insertions(+), 165 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 ae1a348..b076099 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,22 +1,20 @@
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.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.github.pagehelper.util.StringUtil;
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.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;
@@ -26,54 +24,54 @@
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.SysDept;
import com.ycl.system.entity.SysDictData;
import com.ycl.system.mapper.SysConfigMapper;
-import com.ycl.system.mapper.SysDictDataMapper;
import com.ycl.system.model.LoginUser;
import com.ycl.system.page.PageUtil;
+import com.ycl.system.service.ISysDeptService;
+import com.ycl.task.DeleteWorkOrderImgTask;
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 constant.ApiConstants;
import constant.Constants;
import constant.RedisConstant;
+import enumeration.ErrorType;
import enumeration.general.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
-import org.bytedeco.javacv.*;
+import org.bytedeco.javacv.FFmpegFrameGrabber;
+import org.bytedeco.javacv.Frame;
+import org.bytedeco.javacv.FrameGrabber;
+import org.bytedeco.javacv.OpenCVFrameConverter;
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;
-import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.annotation.Async;
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 pojo.CascadeOption;
+import utils.file.FileUtils;
-import javax.imageio.ImageIO;
-import javax.swing.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-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.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -88,16 +86,22 @@
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;
private final NotifyService notifyService;
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}")
private String rtspServer;
@@ -106,22 +110,30 @@
@Autowired
private RedisCache redisCache;
+ @Autowired
+ private DeleteWorkOrderImgTask deleteWorkOrderImgTask;
@Override
- @Transactional(rollbackFor = Exception.class)
public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
+ //閬垮厤鍧�(浜嬪姟鍔犻攣浼氬け鏁堛�佹柟娉曞唴閮ㄨ皟鐢ㄤ簨鍔′細澶辨晥)
+ WorkOrderServiceImpl self = applicationContext.getBean(WorkOrderServiceImpl.class);
+ return self.batchAddWorkOrder(workOrderList);
+ }
+ private boolean isSameDay(Date date1, Date date2) {
+ if (date1 == null || date2 == null) {
+ return false;
+ }
+ LocalDate localDate1 = date1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDate localDate2 = date2.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ return localDate1.isEqual(localDate2);
+ }
+ @Transactional(rollbackFor = Exception.class)
+ 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 +141,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);
@@ -153,6 +171,15 @@
for (WorkOrder workOrder : workOrderList) {
WorkOrder databaseWorkOrder = mapping.get(workOrder.getSerialNumber());
if (Objects.nonNull(databaseWorkOrder)) {
+ //鍒ゆ柇鏄惁鏄粖澶╃殑宸ュ崟
+ if (!isSameDay(databaseWorkOrder.getCreateTime(), now)) {
+ // 鑻ヤ负鍓嶄竴澶╃殑宸ュ崟锛屼笉鏇存柊锛岀洿鎺ュ綋浣滄柊宸ュ崟鏂板
+ workOrder.setCreateTime(now);
+ workOrder.setUpdateTime(now);
+ waitAddList.add(workOrder);
+ continue; // 璺宠繃鍚庣画鐨勬洿鏂伴�昏緫
+ }
+
List<String> errorNameList = databaseWorkOrder.getErrorTypeList();
List<String> errorTypes = workOrder.getErrorTypeList();
if (errorNameList.containsAll(errorTypes)) {
@@ -171,20 +198,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());
@@ -211,9 +238,13 @@
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)
+ .select(YwPoint::getUnitId, YwPoint::getSerialNumber, YwPoint::getImportantTag, YwPoint::getImportantTag, YwPoint::getImportantCommandImageTag)
.in(YwPoint::getSerialNumber, willAddSerialNumber)
+ .eq(YwPoint::getExamineStatus, Boolean.TRUE)
+ .isNotNull(YwPoint::getUnitId)
.list();
Map<String, YwPoint> pointMapping = pointList.stream().collect(Collectors.toMap(YwPoint::getSerialNumber, point -> point));
// 鏌ュ嚭閲嶇偣鐐逛綅銆佹櫘閫氱偣浣嶇殑澶勭悊鏃堕棿
@@ -279,8 +310,9 @@
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);
// 淇濆瓨宸ュ崟鍜屾晠闅滅被鍨�
@@ -309,6 +341,7 @@
return Boolean.TRUE;
}
+
/**
* 娣诲姞
*
@@ -317,31 +350,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)));
@@ -350,10 +449,12 @@
workOrderErrorTypeService.getBaseMapper().insertWorkOrderErrorTypeList(workOrderErrorTypes);
if (baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
+ } else {
+ return Result.error("娣诲姞澶辫触");
}
- return Result.error("娣诲姞澶辫触");
}
}
+
/**
* 淇敼
@@ -397,24 +498,35 @@
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("鎿嶄綔鎴愬姛");
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result batchAuditing(WorkOrderBatchAuditingForm form) {
- // 鏍规嵁鏁呴殰绫诲瀷鑾峰彇鍒楄〃
- List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
- .in(WorkOrder::getStatus, WorkOrderStatusEnum.YW_HANDLE.getValue())
- .in(WorkOrder::getErrorType, form.getErrorTypes())
- .select(WorkOrder::getId, WorkOrder::getUnitId, WorkOrder::getWorkOrderNo, WorkOrder::getSerialNumber)
- .list();
+ //鏍规嵁宸ュ崟缂栧彿鑾峰彇宸ュ崟
+ List<WorkOrder> list = baseMapper.selectByNos(form.getWorkOrderNumbers());
if (list.isEmpty()) {
- return Result.error("娌℃湁宸ュ崟鍙互瀹℃牳");
+ return Result.error("娌℃湁寰呭鏍稿伐鍗�");
}
List<String> workOrderNoList = list.stream().map(WorkOrder::getWorkOrderNo).collect(Collectors.toList());
List<String> serialNumbers = list.stream().map(WorkOrder::getSerialNumber).toList();
@@ -444,17 +556,37 @@
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("鎿嶄綔鎴愬姛");
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result ywCondition(WorkOrderYWConditionForm form) {
+
WorkOrder workOrder = baseMapper.selectById(form.getId());
if (Objects.isNull(workOrder)) {
throw new ServiceException("宸ュ崟涓嶅瓨鍦�");
@@ -471,13 +603,108 @@
workOrderYwConditionRecord.setYwProofMaterials(form.getYwProofMaterials());
workOrderYwConditionRecord.setSysMsg(Boolean.FALSE);
workOrderYwConditionRecordMapper.insert(workOrderYwConditionRecord);
+ //寮傛鑾峰彇鍥剧墖
+ WorkOrderServiceImpl self = applicationContext.getBean(WorkOrderServiceImpl.class);
+ self.getImage(workOrder);
return Result.ok("鎿嶄綔鎴愬姛");
}
+
+ @Override
+ public Result ywConditionList(WorkOrderYWConditionsForm form) {
+ List<WorkOrder> workOrderList = new LambdaQueryChainWrapper<>(baseMapper)
+ .in(WorkOrder::getWorkOrderNo,form.getWorkOrderNumbers())
+ .list();
+ System.out.println("--------------");
+ System.out.println(workOrderList);
+ if (CollectionUtils.isEmpty(workOrderList)) {
+ throw new ServiceException("宸ュ崟涓嶅瓨鍦�");
+ }
+ // 宸ュ崟鐘舵��
+ for (WorkOrder workOrder : workOrderList) {
+ workOrder.setStatus(WorkOrderStatusEnum.YW_HANDLE);
+ workOrder.setYwHandleTime(LocalDateTime.now());
+ }
+ baseMapper.updateMany(workOrderList);
+ // 娣诲姞涓�鏉¤繍缁存儏鍐佃褰�
+ for (WorkOrder workOrder : workOrderList) {
+ WorkOrderYwConditionRecord workOrderYwConditionRecord = new WorkOrderYwConditionRecord();
+ workOrderYwConditionRecord.setWorkOrderNo(workOrder.getWorkOrderNo());
+ workOrderYwConditionRecord.setCommitUser(SecurityUtils.getLoginUser().getUserId().intValue());
+ workOrderYwConditionRecord.setYwCondition(form.getYwCondition());
+ workOrderYwConditionRecord.setYwProofMaterials(form.getYwProofMaterials());
+ workOrderYwConditionRecord.setSysMsg(Boolean.FALSE);
+ workOrderYwConditionRecordMapper.insert(workOrderYwConditionRecord);
+ WorkOrderServiceImpl self = applicationContext.getBean(WorkOrderServiceImpl.class);
+ self.getImage(workOrder);
+ }
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
+ @Async("threadPoolTaskExecutor")
+ public void getImage(WorkOrder workOrder) {
+ List<DeviceInfo> gbDevices = new LambdaQueryChainWrapper<>(deviceInfoMapper)
+ .orderByDesc(DeviceInfo::getUpdateTime)
+ .last("limit 1")
+ .list();
+ if (CollectionUtils.isEmpty(gbDevices)) {
+ return;
+ }
+ // 鍥芥爣璁惧鐨勭紪鐮佸氨鏄彇瑙嗛娴佺殑璁惧缂栫爜锛屽浗鏍囪澶囧氨涓�涓�傚浗鏍囪澶囩殑姣忎竴涓�氶亾浠ｈ〃涓�涓憚鍍忓ご锛屼篃灏辨槸璁惧id鏄彇娴佺殑閫氶亾id
+ String frameImg = null;
+ try {
+ 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();
+ }
+ if (StringUtils.hasText(frameImg)) {
+ WorkOrderCheckImg img = new WorkOrderCheckImg();
+ img.setWorkOrderNo(workOrder.getWorkOrderNo());
+ img.setImgUrl(frameImg);
+ img.setCreateTime(new Date());
+ //淇濈暀鏈�鏂扮殑5寮�
+ workOrderCheckImgMapper.insert(img);
+ }
+ }
+
+ /**
+ * 娓呯悊宸ュ崟鍥剧墖
+ * */
+ public void clearWorkOrderImg(String workOrderNo) {
+ //鍒ゆ柇璇ュ伐鍗曠殑鍥剧墖鏄惁宸茬粡澶т簬5寮犱簡
+ //鎸夌収鍒涘缓鏃ユ湡闄嶅簭鎺掑垪
+ if (StringUtil.isEmpty(workOrderNo)) {
+ return;
+ }
+ List<WorkOrderCheckImg> workOrderList = new LambdaQueryChainWrapper<WorkOrderCheckImg>(workOrderCheckImgMapper)
+ .select()
+ .eq(WorkOrderCheckImg::getWorkOrderNo, workOrderNo)
+ .orderByDesc(WorkOrderCheckImg::getCreateTime)
+ .list();
+ if (workOrderList.size()>=5){
+ List<String> imgList = workOrderList.subList(4,workOrderList.size()).stream().map(WorkOrderCheckImg::getImgUrl).collect(Collectors.toList());
+ List<Integer> idList = workOrderList.subList(4, workOrderList.size()).stream().map(WorkOrderCheckImg::getId).collect(Collectors.toList());
+ //鍒犻櫎鐓х墖 锛屽苟涓旂墿鐞嗗垹闄ゆ湇鍔″櫒鍐呭搴旂収鐗囩殑鍚嶅瓧
+
+// /profile/2024-11-18_1d8e6d37-a4d0-4bba-8473-ff4e50eda83d.png
+ log.error("鍒犻櫎宸ュ崟鐓х墖闆嗗悎url:{}",imgList);
+ log.error("鍒犻櫎宸ュ崟瀛樺偍鏁版嵁闆嗗悎id:{}",idList);
+ for (String filePath: imgList){
+ delImgFormClient(filePath);
+ }
+ workOrderCheckImgMapper.deleteBatchIds(idList);
+ }
+
+ }
+
@Override
public List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(String workOrderNo) {
List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo);
ywConditionList.stream().forEach(item -> {
+ if (item.getUserId().equals(1)) {
+ item.setUnitName("绠＄悊鍛�");
+ }
if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) {
item.setUnitName("绯荤粺娑堟伅");
}
@@ -512,9 +739,29 @@
@Override
public Result remove(List<String> ids) {
if (baseMapper.deleteBatchIds(ids) > 0) {
+ //鎵归噺鍒犻櫎鏄惁琚敤鍒�?
+
return Result.ok("鍒犻櫎鎴愬姛");
}
return Result.error("鍒犻櫎澶辫触");
+ }
+
+ /***
+ * 閫氳繃url鍒犻櫎鏈嶅姟鍣ㄥ唴鐨勫浘鐗�
+ * @param url
+ */
+ public void delImgFormClient(String url){
+ //鎻愬彇鏂囦欢鍚� /profile/2024-11-17_79c02666-da1e-45ba-9f29-7523c848fa4a.png
+ // 杩欓儴鍒�2024-11-17_79c02666-da1e-45ba-9f29-7523c848fa4a.png
+ String imgPath = FileUtils.getImgName(url);
+ if (imgPath.isEmpty()){
+ log.error("url閿欒锛歿}",imgPath);
+ }else{
+ //鎻愬彇鏃ユ湡閮ㄥ垎 缁勮鐩綍 : /opt/zgyw/uploadPath + / + yyyy-MM-dd +
+ String pathName = DeleteWorkOrderImgTask.imgSaveBasePath + "/" + FileUtils.extractDateFromString(url);
+ log.error("鍒犻櫎宸ュ崟鍥剧墖闆嗗悎{}",pathName+"/" + imgPath);
+ FileUtils.deleteFile(pathName+"/" + imgPath);
+ }
}
/**
@@ -525,12 +772,40 @@
*/
@Override
public Result removeById(String id) {
+ WorkOrder workOrder = baseMapper.selectById(id);
+ String workOrderNo = workOrder.getWorkOrderNo();
+ //鍒犻櫎宸ュ崟瀹℃牳璁板綍
+ workOrderAuditingRecordMapper.delete(new QueryWrapper<WorkOrderAuditingRecord>().eq("work_order_no", workOrderNo));
+ //闇�瑕佺墿鐞嗗垹闄ゆ湇鍔″櫒涓殑鍥剧墖
+ //鏌ヨ鍒板伐鍗曠収鐗囬泦鍚�
+ List<String> workOrderImg = workOrderCheckImgMapper
+ .selectList(new QueryWrapper<WorkOrderCheckImg>().eq("work_order_no", workOrderNo))
+ .stream().map(WorkOrderCheckImg::getImgUrl).collect(Collectors.toList());
+ log.error("鍒犻櫎宸ュ崟鍥剧墖闆嗗悎:{}",workOrderImg);
+ log.error("鍒犻櫎璺緞:{}",PlatformConfig.getUploadPath());
+
+ for (String filePath: workOrderImg){
+ delImgFormClient(filePath);
+ }
+
+ //鍒犻櫎宸ュ崟鍥剧墖璁板綍
+ workOrderCheckImgMapper.delete(new QueryWrapper<WorkOrderCheckImg>().eq("work_order_no", workOrderNo));
+ //鍒犻櫎宸ュ崟涓嬪彂璁板綍
+ workOrderDistributeRecordMapper.delete(new QueryWrapper<WorkOrderDistributeRecord>().eq("work_order_no", workOrderNo));
+ //鍒犻櫎宸ュ崟鏁呴殰绫诲瀷
+ workOrderErrorTypeMapper.delete(new QueryWrapper<WorkOrderErrorType>().eq("work_order_no", workOrderNo));
+ //鍒犻櫎宸ュ崟鎯呭喌璁板綍
+ workOrderYwConditionRecordMapper.delete(new QueryWrapper<WorkOrderYwConditionRecord>().eq("work_order_no", workOrderNo));
+
if (baseMapper.deleteById(id) > 0) {
return Result.ok("鍒犻櫎鎴愬姛");
}
return Result.error("鍒犻櫎澶辫触");
}
+
+
+ private final ISysDeptService deptService;
/**
* 鍒嗛〉鏌ヨ
*
@@ -539,29 +814,118 @@
*/
@Override
public Result page(WorkOrderQuery query) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ SysDept sysDept = null;
+ Long deptId =null;
+ if (loginUser.getDeptId() != null){
+ deptId = loginUser.getDeptId();
+ sysDept = deptService.selectDeptById(deptId);
+ }
+ //鏌ヨ鎸囧畾鍖烘暟鎹�
+ // 鐧诲綍璐﹀彿鐨勫瓨鍦ㄩ儴闂� 涓嶅湪閮ㄩ棬鍐呭氨涓嶄紶鍊硷紝榛樿鏌ヨ鍏ㄩ儴
+ if (sysDept !=null){
+ //鏇村叿閮ㄩ棬id鑾峰緱瀵瑰簲鏋氫妇 閮ㄩ棬code
+ AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+ if (areaDeptEnum != null){
+ query.setDept(areaDeptEnum.getCode());
+ }
+ }
+
+
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
- query.setUnitId(SecurityUtils.getUnitId());
- query.setStart(DateUtils.getDayStart(query.getStart()));
- query.setEnd(DateUtils.getDayEnd(query.getEnd()));
+ 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.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 -> {
if (StringUtils.hasText(item.getErrorType())) {
- item.setErrorTypeList(List.of(item.getErrorType().split(",")));
+ List<String> errorTypeList = new ArrayList<>(List.of(item.getErrorType().split(",")));
+ int index = errorTypeList.indexOf(query.getErrorTypeLabel());
+ if (index != -1) {
+ // 淇濆瓨瑕佺Щ鍔ㄧ殑鍏冪礌
+ String firstOccurrence = errorTypeList.get(index);
+ // 浠庡垪琛ㄤ腑绉婚櫎璇ュ厓绱狅紙绗竴娆″嚭鐜扮殑浣嶇疆锛�
+ errorTypeList.remove(index);
+ // 灏嗚鍏冪礌娣诲姞鍒板垪琛ㄧ殑棣栦綅
+ errorTypeList.add(0, firstOccurrence);
+ }
+ // 璁剧疆鏇存柊鍚庣殑鍒楄〃
+ item.setErrorTypeList(errorTypeList);
}
if (StringUtils.hasText(item.getImgListStr())) {
item.setImgList(List.of(item.getImgListStr().split(",")));
}
});
}
+ //鍔犱笂鎶ュ淇℃伅
+ if (!CollectionUtils.isEmpty(page.getRecords())) {
+ List<String> serialNumberList = page.getRecords().stream()
+ .map(WorkOrderVO::getSerialNumber).collect(Collectors.toList());
+ List<Report> reports = new LambdaQueryChainWrapper<>(reportMapper)
+ .in(Report::getSerialNumber, serialNumberList)
+ .eq(Report::getStatus,1)
+ .eq(Report::getDeleted,Boolean.FALSE).list();
+ Map<String, List<Report>> reportMap = reports.stream()
+ .collect(Collectors.groupingBy(Report::getSerialNumber));
+
+ for (WorkOrderVO workOrder : page.getRecords()) {
+ workOrder.setHasReport(false);
+ List<Report> reportsByWorkOrder = reportMap.get(workOrder.getSerialNumber());
+ if (CollectionUtils.isEmpty(reportsByWorkOrder)) {
+ continue; // 鏃犳姤鍛婏紝鐩存帴璺宠繃
+ }
+ Date distributeTime = workOrder.getDistributeTime();
+ for (Report report : reportsByWorkOrder) {
+ Date beginTime = report.getBeginCreateTime();
+ Date endTime = report.getEndCreateTime();
+ // 绌烘寚閽堥槻鎶�
+ if (distributeTime == null || beginTime == null || endTime == null) {
+ continue;
+ }
+ // 鏃堕棿鍖洪棿鍒ゆ柇锛歞istributeTime 鍦� [beginTime, endTime] 鍐�
+ boolean isInRange = distributeTime.compareTo(beginTime) >= 0
+ && distributeTime.compareTo(endTime) <= 0;
+ if (isInRange) {
+ workOrder.setHasReport(true);
+ break; // 鎵惧埌涓�涓嵆閫�鍑哄惊鐜�
+ }
+ }
+ }
+ }
+
+
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@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()));
baseMapper.distributePage(page, query);
return Result.ok().data(page).total(page.getTotal());
+ }
+
+ @Override
+ public List<WorkOrderVO> distributeList(){
+ return baseMapper.distributeList();
}
@Override
@@ -621,6 +985,9 @@
}
}
+
+
+
@Override
@Transactional
public Result selectedIdsDistribute(DistributeWorkOrderQuery query) {
@@ -629,6 +996,7 @@
return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�");
}
try {
+ //杩欐槸鍏ㄩ儴涓嬪彂
if (query.getWorkOrderNOList().isEmpty()) {
query.setWorkOrderNOList(new LambdaQueryChainWrapper<>(baseMapper)
.eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
@@ -757,8 +1125,10 @@
@Override
public WorkOrderTotalVO workOrderTotal(DashboardQuery dashboardQuery) {
+ //todo澶у睆宸ュ崟鏈鐞嗗伐鍗曟暟閲忔湁鐐归棶棰�
return baseMapper.workOrderTotal(dashboardQuery);
}
+
@Override
public List<WorkOrderRegionVO> workOrderRegion(DashboardQuery dashboardQuery) {
@@ -785,12 +1155,13 @@
@Override
- public synchronized String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo) throws Exception {
+ 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);
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);
@@ -847,7 +1218,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);
@@ -908,13 +1279,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)
@@ -922,7 +1293,7 @@
}
@Override
- public Result processImg (String workOrderNo){
+ public Result processImg(String workOrderNo) {
WorkOrder workOrder = new LambdaQueryChainWrapper<>(baseMapper)
.eq(WorkOrder::getWorkOrderNo, workOrderNo)
.one();
@@ -963,17 +1334,44 @@
}
@Override
- public Result detailByNo (String workOrderNo){
+ public Result detailByNo(String workOrderNo) {
WorkOrderDetailVO workOrder = baseMapper.detailByNo(workOrderNo);
+ //鎶ョ┖鍘熷洜1. sql 涓� inner join 琛� t_work_order_distribute_record 涓� 鏃犱笌璇ヨ〃鍏宠仈鐨勮褰� wo.work_order_no = dr.work_order_no
+ if(workOrder == null){
+ workOrder = baseMapper.detailByNoButNoDistributeRecord(workOrderNo);
+ }
+
// 鏄惁鎶ュ
- boolean hasReport = new LambdaQueryChainWrapper<>(reportMapper)
- .eq(Report::getSerialNumber, workOrder.getSerialNumber())
- .exists();
- workOrder.setHasReport(hasReport);
+
+ List<Report> reports = new LambdaQueryChainWrapper<>(reportMapper)
+ .eq(Report::getSerialNumber,workOrder.getSerialNumber())
+ .eq(Report::getStatus,1)
+ .orderByDesc(Report::getCreateTime)
+ .list();
+ log.info("鎶ュ璁板綍:{}",reports);
+ Date distributeTime = workOrder.getDistributeTime();
+ workOrder.setHasReport(false);
+ for (Report report : reports) {
+ Date beginTime = report.getBeginCreateTime();
+ Date endTime = report.getEndCreateTime();
+ // 绌烘寚閽堥槻鎶�
+ if (distributeTime == null || beginTime == null || endTime == null) {
+ continue;
+ }
+ // 鏃堕棿鍖洪棿鍒ゆ柇锛歞istributeTime 鍦� [beginTime, endTime] 鍐�
+ boolean isInRange = distributeTime.compareTo(beginTime) >= 0
+ && distributeTime.compareTo(endTime) <= 0;
+ if (isInRange) {
+ workOrder.setHasReport(true);
+ break; // 鎵惧埌涓�涓嵆閫�鍑哄惊鐜�
+ }
+ }
// 鏁呴殰绫诲瀷
List<SysDictData> errorList = workOrderErrorTypeService.getBaseMapper().getErrorList(workOrder.getWorkOrderNo());
List<String> errList = errorList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());
workOrder.setErrorTypeList(errList);
+ //璇︽儏鏃跺啀娆℃竻鐞�
+ clearWorkOrderImg(workOrderNo);
// 妫�娴嬪浘鐗�
List<WorkOrderCheckImg> imgList = new LambdaQueryChainWrapper<>(workOrderCheckImgMapper)
.eq(WorkOrderCheckImg::getWorkOrderNo, workOrderNo)
@@ -984,99 +1382,241 @@
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");
- }
+ @Autowired
+ private WorkOrderMapper workOrderMapper;
+ /**
+ * 宸ュ崟瀵煎嚭鐨勯�昏緫
+ * 鏍囩锛氬悓涓�涓猧p鏍囩鍚堝湪涓�璧凤紝閽堝绂荤嚎宸ュ崟锛坕p鐩稿悓灏变笉浼氱敓鎴愬伐鍗曪級锛屾柟渚胯繍缁村鐞�
+ *
+ * @param query
+ * @return
+ */
+ @Override
+ 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");
+ 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);
+ }
List<WorkOrderVO> export = baseMapper.export(query);
- System.out.println(export);
+
+ List<String> workOrderNos = export.stream().map(WorkOrderVO::getWorkOrderNo).collect(Collectors.toList());
+ List<WorkOrderVO> auditTimeList = workOrderMapper.getAuditTimeList(workOrderNos);
+ Map<String, List<Date>> auditTimeMap = auditTimeList.stream()
+ .collect(Collectors.groupingBy(
+ WorkOrderVO::getWorkOrderNo, // 鍒嗙粍鐨勯敭
+ Collectors.mapping(WorkOrderVO::getAuditTime, Collectors.toList())));
+ if (!CollectionUtils.isEmpty(workOrderNos)){
+ export.forEach(workOrderVO -> {
+ List<Date> auditTimes = auditTimeMap.get(workOrderVO.getWorkOrderNo());
+ if (!CollectionUtils.isEmpty(auditTimes)){
+ //瀹℃牳閫氳繃鏃堕棿
+ Date passTime = Collections.max(auditTimes);
+ ZoneId zoneId = ZoneId.systemDefault();
+ workOrderVO.setPassTime(passTime.toInstant().atZone(zoneId).toLocalDateTime());
+ }
+ });
+ }
+
+
+
+
+
+ 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 query 鏌ヨ
- * @return {@link List }<{@link WorkOrderWhite }>
- * @author
+ * @param workOrderNo
+ * @return
*/
@Override
- public Result selectWorkOrderWhiteList(WorkOrderWhiteQuery query) {
- IPage<WorkOrderWhite> page = PageUtil.getPage(query, WorkOrderWhite.class);
- workOrderWhiteMapper.page(page, query);
- return Result.ok().data(page.getRecords()).total(page.getTotal());
- }
-
- /**
- * 娣诲姞宸ュ崟鐧藉悕鍗�
- *
- * @param workOrderWhite 鐧借壊宸ュ崟
- * @return {@link Result }
- * @author
- */
- @Override
- public Result addWorkOrderWhite(WorkOrderWhite workOrderWhite) {
- // 閫氳繃璁惧缂栫爜鏌ヨ璁惧淇℃伅
- YwPoint ywPoint = ywPointService.selectBySerialNumber(workOrderWhite.getSerialNumber());
- // 鏂板鐧藉悕鍗曡澶囪褰�
- if (ywPoint == null){
- return Result.error("璁惧涓嶅瓨鍦�");
+ public Result checkImage(String workOrderNo, String serialNumber) {
+ // 鏌ュ嚭鍥芥爣璁惧锛屽氨涓�鏉℃暟鎹�
+ List<DeviceInfo> gbDevices = new LambdaQueryChainWrapper<>(deviceInfoMapper)
+ .orderByDesc(DeviceInfo::getUpdateTime)
+ .last("limit 1")
+ .list();
+ if (!CollectionUtils.isEmpty(gbDevices)) {
+ try {
+ String imgUrl = this.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), serialNumber, workOrderNo);
+ if (StringUtils.hasText(imgUrl)) {
+ WorkOrderCheckImg img = new WorkOrderCheckImg();
+ img.setWorkOrderNo(workOrderNo);
+ img.setImgUrl(imgUrl);
+ img.setCreateTime(new Date());
+ workOrderCheckImgMapper.insert(img);
+ }
+ return Result.ok().data(imgUrl);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
- // 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄨ鐧藉悕鍗�
- WorkOrderWhite flag = workOrderWhiteMapper.selectBySerialNumber(workOrderWhite.getSerialNumber());
- if (flag != null) {
- return Result.error("璇ヨ澶囧凡瀛樺湪鐧藉悕鍗�");
- } else {
- workOrderWhite.setPointName(ywPoint.getPointName());
- workOrderWhite.setCreateBy(SecurityUtils.getUsername());
- workOrderWhiteMapper.insert(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));
+ @Transactional(rollbackFor = Exception.class)
+ public Result batchDeleteWorkOrder(List<String> workOrderNos) {
+ if (!CollectionUtils.isEmpty(workOrderNos)) {
+ //鍒犻櫎宸ュ崟瀹℃牳璁板綍
+ workOrderAuditingRecordMapper.delete(new QueryWrapper<WorkOrderAuditingRecord>().in("work_order_no", workOrderNos));
+ //鍒犻櫎宸ュ崟鍥剧墖璁板綍
+ workOrderCheckImgMapper.delete(new QueryWrapper<WorkOrderCheckImg>().in("work_order_no", workOrderNos));
+ //鍒犻櫎宸ュ崟涓嬪彂璁板綍
+ workOrderDistributeRecordMapper.delete(new QueryWrapper<WorkOrderDistributeRecord>().in("work_order_no", workOrderNos));
+ //鍒犻櫎宸ュ崟鏁呴殰绫诲瀷
+ workOrderErrorTypeMapper.delete(new QueryWrapper<WorkOrderErrorType>().in("work_order_no", workOrderNos));
+ //鍒犻櫎宸ュ崟鎯呭喌璁板綍
+ workOrderYwConditionRecordMapper.delete(new QueryWrapper<WorkOrderYwConditionRecord>().in("work_order_no", workOrderNos));
+ //鍒犻櫎宸ュ崟
+ this.baseMapper.delete(new QueryWrapper<WorkOrder>().in("work_order_no", workOrderNos));
+ }
+ return Result.ok();
}
+
+ @Override
+ public Result errorAll() {
+ List<CascadeOption> results = new ArrayList<>();
+ CascadeOption video = new CascadeOption();
+ video.setLabel("瑙嗛");
+ video.setValue("VIDEO");
+ List<ErrorType> videoErr = ErrorType.getErrorTypesByCategory("VIDEO");
+ List<ErrorType> videoErr1 = ErrorType.getErrorTypesByCategory("COMMON");
+ videoErr.addAll(videoErr1);
+ List<CascadeOption> videoChildren = videoErr.stream().map(item -> CascadeOption.builder()
+ .value(item.getValue())
+ .label(item.getDesc())
+ .build()).collect(Collectors.toList());
+ video.setChildren(videoChildren);
+
+ CascadeOption car = new CascadeOption();
+ car.setLabel("杞﹁締");
+ car.setValue("CAR");
+ List<ErrorType> carErr = ErrorType.getErrorTypesByCategory("CAR");
+ List<ErrorType> carErr1 = ErrorType.getErrorTypesByCategory("COMMON");
+ List<ErrorType> carErr2 = ErrorType.getErrorTypesByCategory("CARORFACE");
+ carErr.addAll(carErr1);
+ carErr.addAll(carErr2);
+ List<CascadeOption> carChildren = carErr.stream().map(item -> CascadeOption.builder()
+ .value(item.getValue())
+ .label(item.getDesc())
+ .build()).collect(Collectors.toList());
+ car.setChildren(carChildren);
+
+ CascadeOption face = new CascadeOption();
+ face.setLabel("浜鸿劯");
+ face.setValue("FACE");
+ List<ErrorType> faceErr = ErrorType.getErrorTypesByCategory("FACE");
+ List<ErrorType> faceErr1 = ErrorType.getErrorTypesByCategory("COMMON");
+ List<ErrorType> faceErr2 = ErrorType.getErrorTypesByCategory("CARORFACE");
+ faceErr.addAll(faceErr1);
+ faceErr.addAll(faceErr2);
+ List<CascadeOption> faceChildren = faceErr.stream().map(item -> CascadeOption.builder()
+ .value(item.getValue())
+ .label(item.getDesc())
+ .build()).collect(Collectors.toList());
+ face.setChildren(faceChildren);
+
+ results.add(video);
+ results.add(car);
+ results.add(face);
+ return Result.ok().data(results);
+ }
+
+ //鐧藉悕鍗曟牎楠�
+ 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