diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 2702db46..5d531fb1 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -415,23 +415,16 @@ public class PythonService { if (CollectionUtils.isEmpty(printBoardElements)) { 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) { - if (noPinNum <= 4) { - return RandomsUtil.randomSysFile(0L, noPinNum + 1); - }else { - return RandomsUtil.randomSysFile(0L, 5L); - } - }else if (pinNum < 8) { - if (noPinNum <= 8 - pinNum) { - return RandomsUtil.randomSysFile(0L, noPinNum + 1); - }else { - long maxNum = 8 - pinNum; - return RandomsUtil.randomSysFile(0L, maxNum + 1); - } - }else { + if (noPinNum == 0L) { return 0; + }else { + long pinNum = printBoardElements.stream().filter(f -> f.getHasPin() == 1).count(); + if (8 - pinNum < 4) { + return RandomsUtil.randomSysFile(0L, 8 - pinNum + 1); + }else { + return RandomsUtil.randomSysFile(0L, 4L + 1); + } } }