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

fix: license明细vo改名

Browse Source
This commit is contained in:
caiyuchao
2025-08-01 10:54:49 +08:00
parent f32cea5fd3
commit 4ecac9a912
6 changed files with 15 additions and 15 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/LicenseController.java
View File

@@ -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<LicenseRespVO> results = new ArrayList<>();
for (LicenseRespVO license : voList) {
List<LicenseNeCodeVO> neCodeList = license.getNeCodeList();
List<LicenseDetailVO> 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<String> 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);
}
}

2
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseNeCodeVO.java → agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicenseDetailVO.java
View File

@@ -12,7 +12,7 @@ import java.util.List;
*/
@Schema(description = "管理后台 - License新增/修改 网元和激活码表单 Request VO")
@Data
public class LicenseNeCodeVO {
public class LicenseDetailVO {
@Schema(description = "网元开关")
private List<Integer> neList;

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

@@ -32,7 +32,7 @@ public class LicensePageReqVO extends PageParam {
private LocalDateTime[] expiryDate;
@Schema(description = "网元激活码列表")
private List<LicenseNeCodeVO> neCodeList;
private List<LicenseDetailVO> neCodeList;
@Schema(description = "用户数")
private Integer userNumber;

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

@@ -63,7 +63,7 @@ public class LicenseRespVO implements VO {
private String activationCode;
@Schema(description = "网元激活码列表")
private List<LicenseNeCodeVO> neCodeList;
private List<LicenseDetailVO> neCodeList;
@Schema(description = "用户数")
@ExcelProperty("用户数")

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

@@ -37,7 +37,7 @@ public class LicenseSaveReqVO {
private Integer ranNumber;
@Schema(description = "网元激活码列表")
private List<LicenseNeCodeVO> neCodeList;
private List<LicenseDetailVO> neCodeList;
@Schema(description = "文件URL")
private String fileUrl;

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

@@ -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<LicenseNeCodeVO> neCodeList = createReqVO.getNeCodeList();
List<LicenseDetailVO> neCodeList = createReqVO.getNeCodeList();
List<LicenseDetailDO> 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<LicenseDetailDO> licenseDetailDOS = licenseDetailMapper.selectList(Wrappers.<LicenseDetailDO>lambdaQuery().eq(LicenseDetailDO::getLicenseId, licenseDO.getId()));
List<LicenseNeCodeVO> details = BeanUtils.toBean(licenseDetailDOS, LicenseNeCodeVO.class);
for (LicenseNeCodeVO detail : details) {
List<LicenseDetailVO> details = BeanUtils.toBean(licenseDetailDOS, LicenseDetailVO.class);
for (LicenseDetailVO detail : details) {
List<String> fileUrlList = new ArrayList<>();
if (StrUtil.isNotBlank(detail.getFileUrl())) {
fileUrlList.add(detail.getFileUrl());
@@ -412,8 +412,8 @@ public class LicenseServiceImpl implements LicenseService {
PageResult<LicenseRespVO> voPageResult = BeanUtils.toBean(pageResult, LicenseRespVO.class);
for (LicenseRespVO licenseRespVO : voPageResult.getList()) {
List<LicenseDetailDO> licenseDetailDOS = licenseDetailMapper.selectList(Wrappers.<LicenseDetailDO>lambdaQuery().eq(LicenseDetailDO::getLicenseId, licenseRespVO.getId()));
List<LicenseNeCodeVO> details = BeanUtils.toBean(licenseDetailDOS, LicenseNeCodeVO.class);
for (LicenseNeCodeVO detail : details) {
List<LicenseDetailVO> details = BeanUtils.toBean(licenseDetailDOS, LicenseDetailVO.class);
for (LicenseDetailVO detail : details) {
List<String> fileUrlList = new ArrayList<>();
if (StrUtil.isNotBlank(detail.getFileUrl())) {
fileUrlList.add(detail.getFileUrl());