From 44cd2d171062c9b07a0eb047cd0ac80d06188e8c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 16 十月 2024 11:58:18 +0800
Subject: [PATCH] 工单bug，数据中心在线率增加存ping状态
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 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 4d824fa..dba4383 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
@@ -211,6 +211,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 +253,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 +267,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);
// 淇濆瓨宸ュ崟鍜屾晠闅滅被鍨�
@@ -766,11 +769,15 @@
public synchronized String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo) throws Exception {
String url = String.format(this.rtspServer + "/api/play/start/img/%s/%s", deviceId, channelId);
String result = HttpUtils.sendGet(url);
- JSONObject jsonObject = JSON.parseObject(result);
- Object imgUrl = jsonObject.get("data");
- imgUrl = Objects.isNull(imgUrl) ? "" : imgUrl;
- log.info("鎷垮埌鍙栨祦鍥剧墖鍝嶅簲缁撴灉锛�" + imgUrl);
- return (String) imgUrl;
+ log.info("鎷垮埌鍙栨祦鍥剧墖鍝嶅簲缁撴灉锛�" + 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) {
--
Gitblit v1.8.0