From 269d80796f218ce01b16c5656bf03971bbf9a814 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 13 Dec 2024 17:12:44 +0800 Subject: [PATCH] update --- .../src/main/java/com/jsowell/service/PileService.java | 10 ++++++---- .../jsowell/pile/service/PileSnGenerateService.java | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index 674f7ce4e..901dd49ac 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -112,15 +112,17 @@ public class PileService { public int batchCreatePile(BatchCreatePileDTO dto) { String softwareProtocol = dto.getSoftwareProtocol(); - if (StringUtils.isBlank(softwareProtocol)) { - throw new BusinessException(ReturnCodeEnum.valueOf("软件协议不能为空")); - } + // if (StringUtils.isBlank(softwareProtocol)) { + // throw new BusinessException(ReturnCodeEnum.valueOf("软件协议不能为空")); + // } // 批量生成sn号 List snList = null; if (StringUtils.equals(SoftwareProtocolEnum.YOU_DIAN.getValue(), softwareProtocol)) { snList = snUtils.generateEBikeSN(dto.getNum()); - } else { + } else if (StringUtils.equals(SoftwareProtocolEnum.YUN_KUAI_CHONG.getValue(), softwareProtocol)){ snList = snUtils.generateEVPileSN(dto.getNum()); + } else { + throw new BusinessException(ReturnCodeEnum.valueOf("软件协议不正确")); } // diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileSnGenerateService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileSnGenerateService.java index 847c9e8ab..82b4a41cb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileSnGenerateService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileSnGenerateService.java @@ -72,7 +72,7 @@ public class PileSnGenerateService { increResult = prefix + year + String.format("%1$010d", increNum); // 保存到字典中 - savePileSn2Dict(pileNum); + // savePileSn2Dict(pileNum); } catch (Exception e) { logger.error("获取序列号失败", e); }