WFC/agt-cloud
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 修改License表字段

Browse Source
This commit is contained in:
caiyuchao
2025-07-16 16:37:07 +08:00
parent 5548e00bda
commit 4dba7aaf1b
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java
View File

@@ -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<Integer> neSwitch;
private List<Integer> neList;
@Schema(description = "用户数")
private Integer userNum;
private Integer userNumber;
@Schema(description = "基站数")
private String baseStationNum;
private String ranNumber;
@Schema(description = "激活码")
private String activationCode;

10
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseRespVO.java
View File

@@ -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<Integer> neSwitch;
private List<Integer> neList;
@Schema(description = "用户数")
@ExcelProperty("用户数")
private Integer userNum;
private Integer userNumber;
@Schema(description = "基站数")
@ExcelProperty("基站数")
private String baseStationNum;
private String ranNumber;
@Schema(description = "激活码")
@ExcelProperty("激活码")

10
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseSaveReqVO.java
View File

@@ -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<Integer> neSwitch;
private List<Integer> neList;
@Schema(description = "用户数")
private Integer userNum;
private Integer userNumber;
@Schema(description = "基站数")
private String baseStationNum;
private String ranNumber;
@Schema(description = "激活码")
private String activationCode;

2
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java
View File

@@ -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));

10
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/dataobject/license/LicenseDO.java
View File

@@ -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<Integer> neSwitch;
private List<Integer> neList;
/**
* 用户数
*/
private Integer userNum;
private Integer userNumber;
/**
* 基站数
*/
private String baseStationNum;
private String ranNumber;
/**
* 激活码
*/

14
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/license/LicenseMapper.java
View File

@@ -20,10 +20,10 @@ public interface LicenseMapper extends BaseMapperX<LicenseDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<LicenseDO>()
.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<LicenseDO> {
.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);
}
}

8
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java
View File

@@ -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());