From b91945ea32378a71d1e57356af6e16703a1ceaa7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 01 十一月 2024 14:52:16 +0800
Subject: [PATCH] 工单只下发考核的、阈值bug
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 176 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 142 insertions(+), 34 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 39cce7e..5859cbc 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
@@ -3,6 +3,8 @@
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;
@@ -12,6 +14,7 @@
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.vo.*;
@@ -37,6 +40,8 @@
import com.ycl.utils.http.HttpUtils;
import com.ycl.utils.redis.RedisCache;
import com.ycl.utils.uuid.IdUtils;
+import constant.ApiConstants;
+import constant.CheckConstants;
import constant.Constants;
import constant.RedisConstant;
import enumeration.general.*;
@@ -94,6 +99,7 @@
private final SysConfigMapper configMapper;
private final ReportMapper reportMapper;
private final WorkOrderCheckImgMapper workOrderCheckImgMapper;
+ private final WorkOrderWhiteMapper workOrderWhiteMapper;
@Value("${rtsp.server:http://127.0.0.1:7788}")
private String rtspServer;
@@ -107,9 +113,14 @@
@Transactional(rollbackFor = Exception.class)
public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
int total = workOrderList.size();
- workOrderList.stream().filter(item -> {
+ // 鏌ヨ鍑虹櫧鍚嶅崟鍒楄〃
+ 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;
}
@@ -161,7 +172,10 @@
willAddErrorType.add(workOrderErrorType);
}
}
- databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ //閬垮厤浠ｄ笅鍙戠殑宸ュ崟鐩存帴鍙樻垚涓嬪彂
+ if(!databaseWorkOrder.getStatus().equals(WorkOrderStatusEnum.WAIT_DISTRIBUTE)) {
+ databaseWorkOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ }
databaseWorkOrder.setUpdateTime(now);
willUpdateStatusWorkOrderList.add(databaseWorkOrder);
updateNum++;
@@ -199,9 +213,11 @@
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)
+ .eq(YwPoint::getExamineStatus, Boolean.TRUE)
.list();
Map<String, YwPoint> pointMapping = pointList.stream().collect(Collectors.toMap(YwPoint::getSerialNumber, point -> point));
// 鏌ュ嚭閲嶇偣鐐逛綅銆佹櫘閫氱偣浣嶇殑澶勭悊鏃堕棿
@@ -211,6 +227,25 @@
List<WorkOrder> notAddList = new ArrayList<>();
//鏌edis浠婃棩宸ュ崟鏁伴噺
int workOrderNum = 0;
+ for (WorkOrder workOrder : waitAddList) {
+ YwPoint point = pointMapping.get(workOrder.getSerialNumber());
+ if (Objects.isNull(point)) {
+ notAddList.add(workOrder);
+ continue;
+ }
+ if (Objects.nonNull(point.getUnitId())) {
+ 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;
+ }
//UUID浣滀负value锛屼繚璇佷笂閿佺殑绾跨▼鑷繁瑙ｉ攣
String requestId = IdUtils.fastSimpleUUID();
try {
@@ -234,23 +269,11 @@
log.error("鑾峰彇閿佸紓甯�");
return Boolean.FALSE;
}
+ //璁板綍宸ュ崟鏁�,琛ュ厖宸ュ崟鍙�
for (WorkOrder workOrder : waitAddList) {
- YwPoint point = pointMapping.get(workOrder.getSerialNumber());
- if (Objects.isNull(point)) {
- notAddList.add(workOrder);
- continue;
- }
//鏁板瓧鍓嶉潰琛�0
workOrderNum++;
workOrder.setWorkOrderNo(IdUtils.workOrderNO(now, String.format("%05d", workOrderNum)));
- if (Objects.nonNull(point.getUnitId())) {
- workOrder.setUnitId(Math.toIntExact(point.getUnitId()));
- }
- if (point.getImportantTag() || point.getImportantCommandImageTag()) {
- workOrder.setProcessingPeriod(Integer.valueOf(important.getConfigValue()));
- } else {
- workOrder.setProcessingPeriod(Integer.valueOf(normal.getConfigValue()));
- }
// 淇濆瓨閿欒绫诲瀷
for (String errorType : workOrder.getErrorTypeList()) {
WorkOrderErrorType workOrderErrorType = new WorkOrderErrorType();
@@ -260,12 +283,8 @@
workOrderErrorType.setErrorName(errorType);
waitAddErrorTypeList.add(workOrderErrorType);
}
+ log.info("鍗冲皢鐢熸垚鐨勫伐鍗�:{}",workOrder);
}
- waitAddList.removeAll(notAddList);
- if (CollectionUtils.isEmpty(waitAddList)) {
- return Boolean.TRUE;
- }
- //璁板綍宸ュ崟鏁�
redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum);
redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId);
// 淇濆瓨宸ュ崟鍜屾晠闅滅被鍨�
@@ -318,19 +337,26 @@
return Result.error("宸ュ崟姝ｅ湪娣诲姞锛岃绋嶅悗鍐嶈瘯");
}
WorkOrder entity = WorkOrderForm.getEntityByForm(form, null);
- 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)));
- entity.setErrorType(String.join(",", form.getErrorType()));
- List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType)).toList();
- workOrderErrorTypeService.getBaseMapper().insertWorkOrderErrorTypeList(workOrderErrorTypes);
- if (baseMapper.insert(entity) > 0) {
- return Result.ok("娣诲姞鎴愬姛");
+ // 鏌ヨ鍑虹櫧鍚嶅崟鍒楄〃
+ List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());
+ // 閬嶅巻宸ュ崟鍒楄〃锛屽垽鏂槸鍚﹀湪鐧藉悕鍗曚腑
+ if (serialNumbers.contains(entity.getSerialNumber())){
+ return Result.error("璇ヨ澶囧湪鐧藉悕鍗曚腑锛屼笉鑳芥坊鍔犲伐鍗�");
+ }else {
+ 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)));
+ entity.setErrorType(String.join(",", form.getErrorType()));
+ List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType)).toList();
+ workOrderErrorTypeService.getBaseMapper().insertWorkOrderErrorTypeList(workOrderErrorTypes);
+ if (baseMapper.insert(entity) > 0) {
+ return Result.ok("娣诲姞鎴愬姛");
+ }
+ return Result.error("娣诲姞澶辫触");
}
- return Result.error("娣诲姞澶辫触");
}
/**
@@ -767,7 +793,14 @@
String url = String.format(this.rtspServer + "/api/play/start/img/%s/%s", deviceId, channelId);
String result = HttpUtils.sendGet(url);
log.info("鎷垮埌鍙栨祦鍥剧墖鍝嶅簲缁撴灉锛�" + result);
- return result;
+ WVPResult wvpResult = JSON.parseObject(result, WVPResult.class);
+ if(wvpResult.getCode() == 0) {
+ Object imgUrl = (Object) wvpResult.getData();
+ imgUrl = Objects.isNull(imgUrl) ? "" : imgUrl;
+ log.info("鎷垮埌鍙栨祦鍥剧墖锛�" + imgUrl);
+ return (String) imgUrl;
+ }
+ return null;
// WVPResult wvpResult = JSON.parseObject(result, WVPResult.class);
// String imgUrl = null;
// if (wvpResult.getCode() == 0) {
@@ -975,4 +1008,79 @@
System.out.println(export);
return export;
}
+
+ /**
+ * 宸ュ崟鐧藉悕鍗曞垪琛�
+ *
+ * @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);
+ 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("璁惧涓嶅瓨鍦�");
+ }
+ // 妫�鏌ユ槸鍚﹀凡缁忓瓨鍦ㄨ鐧藉悕鍗�
+ 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));
+ }
}
--
Gitblit v1.8.0