From 4dba7aaf1b1a78be97d707be92fe86dd1fbe2cce Mon Sep 17 00:00:00 2001 From: caiyuchao Date: Wed, 16 Jul 2025 16:37:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9License=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/license/vo/LicensePageReqVO.java | 10 +++++----- .../controller/admin/license/vo/LicenseRespVO.java | 10 +++++----- .../admin/license/vo/LicenseSaveReqVO.java | 10 +++++----- .../admin/project/ProjectController.java | 2 +- .../license/dal/dataobject/license/LicenseDO.java | 10 +++++----- .../license/dal/mysql/license/LicenseMapper.java | 14 +++++++------- .../service/license/LicenseServiceImpl.java | 8 ++++---- 7 files changed, 32 insertions(+), 32 deletions(-) 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 f468cb7..1cd8bd7 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 @@ -25,20 +25,20 @@ public class LicensePageReqVO extends PageParam { private Long projectId; @Schema(description = "sn") - private String sn; + private String serialNo; @Schema(description = "到期时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] expirationTime; + private LocalDateTime[] expiryDate; @Schema(description = "网元开关") - private List neSwitch; + private List neList; @Schema(description = "用户数") - private Integer userNum; + private Integer userNumber; @Schema(description = "基站数") - private String baseStationNum; + private String ranNumber; @Schema(description = "激活码") private String activationCode; 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 e00d962..0e98038 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 @@ -43,24 +43,24 @@ public class LicenseRespVO implements VO { @Schema(description = "sn", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("sn") - private String sn; + private String serialNo; @Schema(description = "到期时间") @ExcelProperty("到期时间") - private LocalDateTime expirationTime; + private LocalDateTime expiryDate; @Schema(description = "网元开关") @ExcelProperty(value = "网元开关", converter = DictConvert.class) @DictFormat("lic_ne_switch") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private List neSwitch; + private List neList; @Schema(description = "用户数") @ExcelProperty("用户数") - private Integer userNum; + private Integer userNumber; @Schema(description = "基站数") @ExcelProperty("基站数") - private String baseStationNum; + private String ranNumber; @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 3a6d2c3..78fa3eb 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 @@ -25,19 +25,19 @@ public class LicenseSaveReqVO { @Schema(description = "sn", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "sn不能为空") - private String sn; + private String serialNo; @Schema(description = "到期时间") - private LocalDateTime expirationTime; + private LocalDateTime expiryDate; @Schema(description = "网元开关") - private List neSwitch; + private List neList; @Schema(description = "用户数") - private Integer userNum; + private Integer userNumber; @Schema(description = "基站数") - private String baseStationNum; + private String ranNumber; @Schema(description = "激活码") private String activationCode; diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java index 19be042..7143866 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java @@ -93,7 +93,7 @@ public class ProjectController { for (ProjectRespVO project : projects) { LicenseDO licenseDO = licenseMapper.selectOne(LicenseDO::getProjectId, project.getId()); if (licenseDO != null) { - project.setSn(licenseDO.getSn()); + project.setSn(licenseDO.getSerialNo()); } } return success(BeanUtils.toBean(pageResult, ProjectRespVO.class)); diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/license/LicenseDO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/license/LicenseDO.java index 2de73f6..db80c5c 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/license/LicenseDO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/license/LicenseDO.java @@ -47,26 +47,26 @@ public class LicenseDO extends BaseDO { /** * sn */ - private String sn; + private String serialNo; /** * 到期时间 */ - private LocalDateTime expirationTime; + private LocalDateTime expiryDate; /** * 网元开关 * * 枚举 {@link TODO lic_ne_switch 对应的类} */ @TableField(typeHandler = JacksonTypeHandler.class) - private List neSwitch; + private List neList; /** * 用户数 */ - private Integer userNum; + private Integer userNumber; /** * 基站数 */ - private String baseStationNum; + private String ranNumber; /** * 激活码 */ diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java index 002201b..14a061c 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java @@ -20,10 +20,10 @@ public interface LicenseMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(LicenseDO::getCustomerId, reqVO.getCustomerId()) .eqIfPresent(LicenseDO::getProjectId, reqVO.getProjectId()) - .likeIfPresent(LicenseDO::getSn, reqVO.getSn()) - .betweenIfPresent(LicenseDO::getExpirationTime, reqVO.getExpirationTime()) - .eqIfPresent(LicenseDO::getUserNum, reqVO.getUserNum()) - .eqIfPresent(LicenseDO::getBaseStationNum, reqVO.getBaseStationNum()) + .likeIfPresent(LicenseDO::getSerialNo, reqVO.getSerialNo()) + .betweenIfPresent(LicenseDO::getExpiryDate, reqVO.getExpiryDate()) + .eqIfPresent(LicenseDO::getUserNumber, reqVO.getUserNumber()) + .eqIfPresent(LicenseDO::getRanNumber, reqVO.getRanNumber()) .eqIfPresent(LicenseDO::getActivationCode, reqVO.getActivationCode()) .eqIfPresent(LicenseDO::getLicenseContent, reqVO.getLicenseContent()) .eqIfPresent(LicenseDO::getApplicant, reqVO.getApplicant()) @@ -31,12 +31,12 @@ public interface LicenseMapper extends BaseMapperX { .eqIfPresent(LicenseDO::getStatus, reqVO.getStatus()) .eqIfPresent(LicenseDO::getRemark, reqVO.getRemark()) .betweenIfPresent(LicenseDO::getCreateTime, reqVO.getCreateTime()) - .apply(CollUtil.isNotEmpty(reqVO.getNeSwitch()), "JSON_CONTAINS(ne_switch, {0})", - reqVO.getNeSwitch() != null ? reqVO.getNeSwitch().toString() : "") + .apply(CollUtil.isNotEmpty(reqVO.getNeList()), "JSON_CONTAINS(ne_switch, {0})", + reqVO.getNeList() != null ? reqVO.getNeList().toString() : "") .orderByDesc(LicenseDO::getId)); } default LicenseDO selectBySn(String sn) { - return selectOne(LicenseDO::getSn, sn); + return selectOne(LicenseDO::getSerialNo, sn); } } \ No newline at end of file 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 c72cd3f..dabeeca 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 @@ -34,8 +34,8 @@ public class LicenseServiceImpl implements LicenseService { @Override public Long createLicense(LicenseSaveReqVO createReqVO) { // 校验项目Sn是否唯一 - if (!validateLicenseSnUnique(createReqVO.getSn(), createReqVO.getId())) { - throw exception(LICENSE_SN_DUPLICATE, createReqVO.getSn()); + if (!validateLicenseSnUnique(createReqVO.getSerialNo(), createReqVO.getId())) { + throw exception(LICENSE_SN_DUPLICATE, createReqVO.getSerialNo()); } // 插入 LicenseDO license = BeanUtils.toBean(createReqVO, LicenseDO.class); @@ -48,8 +48,8 @@ public class LicenseServiceImpl implements LicenseService { @Override public void updateLicense(LicenseSaveReqVO updateReqVO) { // 校验项目Sn是否唯一 - if (!validateLicenseSnUnique(updateReqVO.getSn(), updateReqVO.getId())) { - throw exception(LICENSE_SN_DUPLICATE, updateReqVO.getSn()); + if (!validateLicenseSnUnique(updateReqVO.getSerialNo(), updateReqVO.getId())) { + throw exception(LICENSE_SN_DUPLICATE, updateReqVO.getSerialNo()); } // 校验存在 validateLicenseExists(updateReqVO.getId());