From 39676fc53ae0fce69aadcd5125accc1c67d463a5 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 09 八月 2024 14:30:34 +0800 Subject: [PATCH] 方法格式 --- ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 29 +++++++++++++++++++++++------ ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 2 +- ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 2 +- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java index a6d00a6..8ad3749 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java @@ -26,7 +26,7 @@ * @param workOrderList * @return */ - Boolean addWaitDistribute(List<WorkOrder> workOrderList); + Boolean innerAddWorkOrder(List<WorkOrder> workOrderList); /** 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 343c7ce..b9a473e 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 @@ -75,7 +75,7 @@ @Override @Transactional(rollbackFor = Exception.class) - public Boolean addWaitDistribute(List<WorkOrder> workOrderList) { + public Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) { int total = workOrderList.size(); workOrderList.stream().filter(item -> { return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && StringUtils.hasText(item.getErrorType()); diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java index 13786b9..c03051e 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java @@ -155,8 +155,8 @@ check(YwThreadConstants.Face_FailPercent, failPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,""); } /** 娣诲姞宸ュ崟 */ - workOrderService.addWaitDistribute(workOrderList); - workOrderService.addWaitDistribute(distributeList); + workOrderService.innerAddWorkOrder(workOrderList); + workOrderService.innerAddWorkOrder(distributeList); } /** @@ -197,11 +197,16 @@ check(YwThreadConstants.Car_NoIntegrityCount, noIntegrityCountResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,""); } /** 娣诲姞宸ュ崟 */ - workOrderService.addWaitDistribute(workOrderList); - workOrderService.addWaitDistribute(distributeList); + workOrderService.innerAddWorkOrder(workOrderList); + workOrderService.innerAddWorkOrder(distributeList); } - //灏佽闃堝�间负map + /** + * 鎶婇槇鍊兼潯浠舵煡鍑烘潵锛岃浆鎴恗ap + * + * @param name + * @return + */ private Map<String, YwThreshold> getYwThresholdMap(String name) { return ywThresholdMapper.selectList( new QueryWrapper<YwThreshold>().eq("monitor_type", name) @@ -211,7 +216,19 @@ )); } - //妫�鏌ラ槇鍊� + /** + * 妫�鏌ラ槇鍊� + * + * @param key 鏌愰槇鍊兼爣璇� + * @param value 鎺ュ彛鑾峰彇鍒扮殑鍊� + * @param serialNumber 鍥芥爣鐮� + * @param thresholds 闃堝�兼潯浠秏ap + * @param distributeList 瑕佷笅鍙戠殑宸ュ崟瀹瑰櫒 + * @param workOrderList 寰呬笅鍙戠殑宸ュ崟瀹瑰櫒 + * @param compareType 姣旇緝鏂瑰紡锛�>= <= + * @param errorType 鏁呴殰绫诲瀷 + * @param <T> + */ private <T extends Comparable<T>> void check(String key, T value, String serialNumber, Map<String, YwThreshold> thresholds, List distributeList, List workOrderList, CompareType compareType,String errorType) { Optional.ofNullable(value).ifPresentOrElse( v -> { -- Gitblit v1.8.0