From 4ecac9a912b3087cfdf154be8196d4c7a5000b7c Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Fri, 1 Aug 2025 10:54:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20license=E6=98=8E=E7=BB=86vo=E6=94=B9?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/license/LicenseController.java | 10 +++++----- .../{LicenseNeCodeVO.java => LicenseDetailVO.java} | 2 +- .../admin/license/vo/LicensePageReqVO.java | 2 +- .../controller/admin/license/vo/LicenseRespVO.java | 2 +- .../admin/license/vo/LicenseSaveReqVO.java | 2 +- .../license/service/license/LicenseServiceImpl.java | 12 ++++++------ 6 files changed, 15 insertions(+), 15 deletions(-) rename agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/{LicenseNeCodeVO.java => LicenseDetailVO.java} (96%) diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java index 90a81bd..8bfdf0b 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/LicenseController.java @@ -16,7 +16,7 @@ import org.agt.framework.common.util.object.BeanUtils; import org.agt.framework.dict.core.DictFrameworkUtils; import org.agt.framework.excel.core.util.ExcelUtils; import org.agt.framework.translate.core.TranslateUtils; -import org.agt.module.license.controller.admin.license.vo.LicenseNeCodeVO; +import org.agt.module.license.controller.admin.license.vo.LicenseDetailVO; import org.agt.module.license.controller.admin.license.vo.LicensePageReqVO; import org.agt.module.license.controller.admin.license.vo.LicenseRespVO; import org.agt.module.license.controller.admin.license.vo.LicenseSaveReqVO; @@ -116,16 +116,16 @@ public class LicenseController { List results = new ArrayList<>(); for (LicenseRespVO license : voList) { - List neCodeList = license.getNeCodeList(); + List neCodeList = license.getNeCodeList(); if (CollUtil.isEmpty(neCodeList)) { results.add(license); } else { - for (LicenseNeCodeVO licenseNeCodeVO : neCodeList) { + for (LicenseDetailVO licenseDetailVO : neCodeList) { LicenseRespVO licenseVO = new LicenseRespVO(); BeanUtils.copyProperties(license, licenseVO); List neLabels = new ArrayList<>(); - for (Integer ne : licenseNeCodeVO.getNeList()) { + for (Integer ne : licenseDetailVO.getNeList()) { String label = DictFrameworkUtils.parseDictDataLabel("lic_ne_all", ne.toString()); if (StrUtil.isBlank(label)) { label = DictFrameworkUtils.parseDictDataLabel("lic_ne_5g", ne.toString()); @@ -144,7 +144,7 @@ public class LicenseController { String neListStr = StrUtil.join("_", neLabels); licenseVO.setNeListStr(neListStr); - licenseVO.setActivationCode(licenseNeCodeVO.getActivationCode()); + licenseVO.setActivationCode(licenseDetailVO.getActivationCode()); results.add(licenseVO); } } diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseNeCodeVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseDetailVO.java similarity index 96% rename from agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseNeCodeVO.java rename to agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseDetailVO.java index f8d8b0b..2738dbc 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseNeCodeVO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseDetailVO.java @@ -12,7 +12,7 @@ import java.util.List; */ @Schema(description = "管理后台 - License新增/修改 网元和激活码表单 Request VO") @Data -public class LicenseNeCodeVO { +public class LicenseDetailVO { @Schema(description = "网元开关") private List neList; diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java index 3d39ed2..5afbc40 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java @@ -32,7 +32,7 @@ public class LicensePageReqVO extends PageParam { private LocalDateTime[] expiryDate; @Schema(description = "网元激活码列表") - private List neCodeList; + private List neCodeList; @Schema(description = "用户数") private Integer userNumber; diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseRespVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseRespVO.java index b77ba63..37cf310 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseRespVO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseRespVO.java @@ -63,7 +63,7 @@ public class LicenseRespVO implements VO { private String activationCode; @Schema(description = "网元激活码列表") - private List neCodeList; + private List neCodeList; @Schema(description = "用户数") @ExcelProperty("用户数") diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseSaveReqVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseSaveReqVO.java index 702dc91..3a3d04a 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseSaveReqVO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseSaveReqVO.java @@ -37,7 +37,7 @@ public class LicenseSaveReqVO { private Integer ranNumber; @Schema(description = "网元激活码列表") - private List neCodeList; + private List neCodeList; @Schema(description = "文件URL") private String fileUrl; diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java index d571457..36672ed 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java @@ -13,7 +13,7 @@ import org.agt.framework.common.util.object.BeanUtils; import org.agt.framework.dict.core.DictFrameworkUtils; import org.agt.framework.web.core.util.WebFrameworkUtils; import org.agt.module.infra.api.file.FileApi; -import org.agt.module.license.controller.admin.license.vo.LicenseNeCodeVO; +import org.agt.module.license.controller.admin.license.vo.LicenseDetailVO; import org.agt.module.license.controller.admin.license.vo.LicensePageReqVO; import org.agt.module.license.controller.admin.license.vo.LicenseRespVO; import org.agt.module.license.controller.admin.license.vo.LicenseSaveReqVO; @@ -100,7 +100,7 @@ public class LicenseServiceImpl implements LicenseService { license.setStatus(LicenseStatusEnum.NOT_APPLIED.getCode()); licenseMapper.insert(license); - List neCodeList = createReqVO.getNeCodeList(); + List neCodeList = createReqVO.getNeCodeList(); List licenseDetails = BeanUtils.toBean(neCodeList, LicenseDetailDO.class); for (LicenseDetailDO licenseDetail : licenseDetails) { @@ -391,8 +391,8 @@ public class LicenseServiceImpl implements LicenseService { LicenseDO licenseDO = licenseMapper.selectById(id); LicenseRespVO licenseRespVO = BeanUtils.toBean(licenseDO, LicenseRespVO.class); List licenseDetailDOS = licenseDetailMapper.selectList(Wrappers.lambdaQuery().eq(LicenseDetailDO::getLicenseId, licenseDO.getId())); - List details = BeanUtils.toBean(licenseDetailDOS, LicenseNeCodeVO.class); - for (LicenseNeCodeVO detail : details) { + List details = BeanUtils.toBean(licenseDetailDOS, LicenseDetailVO.class); + for (LicenseDetailVO detail : details) { List fileUrlList = new ArrayList<>(); if (StrUtil.isNotBlank(detail.getFileUrl())) { fileUrlList.add(detail.getFileUrl()); @@ -412,8 +412,8 @@ public class LicenseServiceImpl implements LicenseService { PageResult voPageResult = BeanUtils.toBean(pageResult, LicenseRespVO.class); for (LicenseRespVO licenseRespVO : voPageResult.getList()) { List licenseDetailDOS = licenseDetailMapper.selectList(Wrappers.lambdaQuery().eq(LicenseDetailDO::getLicenseId, licenseRespVO.getId())); - List details = BeanUtils.toBean(licenseDetailDOS, LicenseNeCodeVO.class); - for (LicenseNeCodeVO detail : details) { + List details = BeanUtils.toBean(licenseDetailDOS, LicenseDetailVO.class); + for (LicenseDetailVO detail : details) { List fileUrlList = new ArrayList<>(); if (StrUtil.isNotBlank(detail.getFileUrl())) { fileUrlList.add(detail.getFileUrl());