From da426ecaf4fd047c6cb43cd9a0c1288e39c4e91d Mon Sep 17 00:00:00 2001 From: lohir <3399054449@qq.com> Date: 星期三, 23 十月 2024 11:24:57 +0800 Subject: [PATCH] 完成运维考核-工单白名单-新增、删除 --- ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 197 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 132 insertions(+), 65 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 dad7b84..aa99ac7 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; @@ -94,6 +96,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; @@ -211,6 +214,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锛屼繚璇佷笂閿佺殑绾跨▼鑷繁瑙i攣 String requestId = IdUtils.fastSimpleUUID(); try { @@ -234,23 +256,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 +270,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); // 淇濆瓨宸ュ崟鍜屾晠闅滅被鍨� @@ -764,56 +770,64 @@ @Override public synchronized String getFrameImgByDevice(String deviceId, String channelId, String workOrderNo) throws Exception { - String url = String.format(this.rtspServer + "/api/play/start/%s/%s", deviceId, channelId); + String url = String.format(this.rtspServer + "/api/play/start/img/%s/%s", deviceId, channelId); String result = HttpUtils.sendGet(url); - log.info("鎷垮埌鍙栨祦鍝嶅簲缁撴灉锛�" + result); + log.info("鎷垮埌鍙栨祦鍥剧墖鍝嶅簲缁撴灉锛�" + result); WVPResult wvpResult = JSON.parseObject(result, WVPResult.class); - String imgUrl = null; - if (wvpResult.getCode() == 0) { - JSONObject data = (JSONObject) wvpResult.getData(); - String rtspUrl = data.getString("fmp4"); // 鍙杕p4鍦板潃 - if (StringUtils.hasText(rtspUrl)) { - System.out.println("鐩爣鍦板潃锛�" + rtspUrl); - FFmpegFrameGrabber grabber = null; - try { - grabber = new FFmpegFrameGrabber(rtspUrl); -// grabber.setOption("rtsp_transport", "tcp"); // 浣跨敤tcp鐨勬柟寮忥紝涓嶇劧浼氫涪鍖呭緢涓ラ噸 -// grabber.setVideoOption("probesize", "10000"); // 璁剧疆鎹曡幏鍒嗘瀽鐨勬渶澶у瓧鑺� - grabber.start(); - Frame frame = grabber.grabImage(); // 鐩存帴鎹曡幏涓�甯� - if (frame != null) { - System.out.println("鎴愬姛鎹曡幏涓�甯�"); - // 灏咶rame杞崲涓篗at - OpenCVFrameConverter.ToMat converter = new OpenCVFrameConverter.ToMat(); - Mat mat = converter.convertToMat(frame); - - imgUrl = workOrderNo + "_" + IdUtils.fastSimpleUUID() + ".png"; - // 鐢熸垚鍥剧墖璺緞 - String imgPath = PlatformConfig.getProfile() + "/" + imgUrl; - System.out.println("鍥剧墖淇濆瓨鍦板潃锛�" + imgPath); - imgUrl = Constants.RESOURCE_PREFIX + "/" + imgUrl; - // 淇濆瓨鍥剧墖 - opencv_imgcodecs.imwrite(imgPath, mat); - } else { - System.out.println("鏈崟鑾峰埌甯�"); - } - } catch (FrameGrabber.Exception e) { - e.printStackTrace(); - } finally { - if (grabber != null) { - try { - grabber.stop(); // 鍋滄鎹曡幏 - } catch (FrameGrabber.Exception e) { - e.printStackTrace(); - } - } - } - } - } else { - System.out.println("璇锋眰澶辫触锛岄敊璇爜锛�" + wvpResult.getCode() + "--" + wvpResult.getMsg()); + if(wvpResult.getCode() == 0) { + Object imgUrl = (Object) wvpResult.getData(); + imgUrl = Objects.isNull(imgUrl) ? "" : imgUrl; + log.info("鎷垮埌鍙栨祦鍥剧墖锛�" + imgUrl); + return (String) imgUrl; } - System.out.println("鍥剧墖URL锛�" + imgUrl); - return imgUrl; + return null; +// WVPResult wvpResult = JSON.parseObject(result, WVPResult.class); +// String imgUrl = null; +// if (wvpResult.getCode() == 0) { +// JSONObject data = (JSONObject) wvpResult.getData(); +// String rtspUrl = data.getString("fmp4"); // 鍙杕p4鍦板潃 +// if (StringUtils.hasText(rtspUrl)) { +// System.out.println("鐩爣鍦板潃锛�" + rtspUrl); +// FFmpegFrameGrabber grabber = null; +// try { +// grabber = new FFmpegFrameGrabber(rtspUrl); +//// grabber.setOption("rtsp_transport", "tcp"); // 浣跨敤tcp鐨勬柟寮忥紝涓嶇劧浼氫涪鍖呭緢涓ラ噸 +//// grabber.setVideoOption("probesize", "10000"); // 璁剧疆鎹曡幏鍒嗘瀽鐨勬渶澶у瓧鑺� +// grabber.start(); +// Frame frame = grabber.grabImage(); // 鐩存帴鎹曡幏涓�甯� +// if (frame != null) { +// System.out.println("鎴愬姛鎹曡幏涓�甯�"); +// // 灏咶rame杞崲涓篗at +// OpenCVFrameConverter.ToMat converter = new OpenCVFrameConverter.ToMat(); +// Mat mat = converter.convertToMat(frame); +// +// imgUrl = workOrderNo + "_" + IdUtils.fastSimpleUUID() + ".png"; +// // 鐢熸垚鍥剧墖璺緞 +// String imgPath = PlatformConfig.getProfile() + "/" + imgUrl; +// System.out.println("鍥剧墖淇濆瓨鍦板潃锛�" + imgPath); +// imgUrl = Constants.RESOURCE_PREFIX + "/" + imgUrl; +// // 淇濆瓨鍥剧墖 +// opencv_imgcodecs.imwrite(imgPath, mat); +// } else { +// System.out.println("鏈崟鑾峰埌甯�"); +// } +// } catch (FrameGrabber.Exception e) { +// e.printStackTrace(); +// } finally { +// if (grabber != null) { +// try { +// grabber.stop(); // 鍋滄鎹曡幏 +// } catch (FrameGrabber.Exception e) { +// e.printStackTrace(); +// } +// } +// } +// } +// } else { +// System.out.println("璇锋眰澶辫触锛岄敊璇爜锛�" + wvpResult.getCode() + "--" + wvpResult.getMsg()); +// } +// System.out.println("鍥剧墖URL锛�" + imgUrl); +// return imgUrl; } @Override @@ -974,4 +988,57 @@ 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(); + } } -- Gitblit v1.8.0