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-21 11:11:08 +08:00
parent f234941ac4
commit 7ae43a47d0
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Optional;
import static org.agt.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static org.agt.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static org.agt.framework.common.pojo.CommonResult.success; import static org.agt.framework.common.pojo.CommonResult.success;
@@ -91,10 +92,9 @@ public class ProjectController {
PageResult<ProjectRespVO> pageResult = BeanUtils.toBean(doPageResult, ProjectRespVO.class); PageResult<ProjectRespVO> pageResult = BeanUtils.toBean(doPageResult, ProjectRespVO.class);
List<ProjectRespVO> projects = pageResult.getList(); List<ProjectRespVO> projects = pageResult.getList();
for (ProjectRespVO project : projects) { for (ProjectRespVO project : projects) {
LicenseDO licenseDO = licenseMapper.selectOne(LicenseDO::getProjectId, project.getId()); List<LicenseDO> licenseDOS = licenseMapper.selectList(LicenseDO::getProjectId, project.getId());
if (licenseDO != null) { Optional<LicenseDO> first = licenseDOS.stream().findFirst();
project.setSn(licenseDO.getSerialNo()); first.ifPresent(licenseDO -> project.setSn(licenseDO.getSerialNo()));
}
} }
return success(BeanUtils.toBean(pageResult, ProjectRespVO.class)); return success(BeanUtils.toBean(pageResult, ProjectRespVO.class));
} }

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

@@ -77,6 +77,9 @@ public class LicenseServiceImpl implements LicenseService {
LicenseDO license = BeanUtils.toBean(createReqVO, LicenseDO.class); LicenseDO license = BeanUtils.toBean(createReqVO, LicenseDO.class);
license.setStatus(LicenseStatusEnum.NOT_APPLIED.getCode()); license.setStatus(LicenseStatusEnum.NOT_APPLIED.getCode());
licenseMapper.insert(license); licenseMapper.insert(license);
createReqVO.setId(license.getId());
applyLicense(createReqVO);
// 返回 // 返回
return license.getId(); return license.getId();
} }