From 955ebd09046bff82b1100f6b4f693082528a906e Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Mon, 20 Nov 2023 16:41:35 +0800 Subject: [PATCH] =?UTF-8?q?TASK:=20=E5=8D=B0=E8=8A=B1=E9=80=BB=E8=BE=91;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/python/PythonService.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 98a67323..ed6138d6 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -416,16 +416,23 @@ public class PythonService { return 0; } long pinNum = printBoardElements.stream().filter(f -> f.getHasPin() == 1).count(); + long noPinNum = printBoardElements.stream().filter(f -> f.getHasPin() == 0).count(); if (pinNum <= 4) { - return RandomsUtil.randomSysFile(0L, 5L); + if (noPinNum <= 4) { + return RandomsUtil.randomSysFile(0L, noPinNum + 1); + }else { + return RandomsUtil.randomSysFile(0L, 5L); + } }else if (pinNum < 8) { - long maxNum = 8 - pinNum; - return RandomsUtil.randomSysFile(0L, maxNum + 1); + if (noPinNum <= 8 - pinNum) { + return RandomsUtil.randomSysFile(0L, noPinNum + 1); + }else { + long maxNum = 8 - pinNum; + return RandomsUtil.randomSysFile(0L, maxNum + 1); + } }else { return 0; } - - } private List coverToDesignPythonItem(ValidateElementVO elementVO, CurrentDesignPictureTypeEnum designPictureType) {