From 35d325f87d78d942d78a538dd36d5317f0876313 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 15 十月 2024 19:03:55 +0800 Subject: [PATCH] 异常恢复的统计数bug --- ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 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..0438581 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 @@ -240,9 +240,6 @@ 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())); } @@ -265,7 +262,12 @@ if (CollectionUtils.isEmpty(waitAddList)) { return Boolean.TRUE; } - //璁板綍宸ュ崟鏁� + //璁板綍宸ュ崟鏁�,琛ュ厖宸ュ崟鍙� + for (WorkOrder workOrder : waitAddList) { + //鏁板瓧鍓嶉潰琛�0 + workOrderNum++; + workOrder.setWorkOrderNo(IdUtils.workOrderNO(now, String.format("%05d", workOrderNum))); + } redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum); redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId); // 淇濆瓨宸ュ崟鍜屾晠闅滅被鍨� @@ -767,7 +769,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) { -- Gitblit v1.8.0