feat: 创建同时申请license
This commit is contained in:
@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import static org.agt.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
|
||||
import static org.agt.framework.common.pojo.CommonResult.success;
|
||||
@@ -91,10 +92,9 @@ public class ProjectController {
|
||||
PageResult<ProjectRespVO> pageResult = BeanUtils.toBean(doPageResult, ProjectRespVO.class);
|
||||
List<ProjectRespVO> projects = pageResult.getList();
|
||||
for (ProjectRespVO project : projects) {
|
||||
LicenseDO licenseDO = licenseMapper.selectOne(LicenseDO::getProjectId, project.getId());
|
||||
if (licenseDO != null) {
|
||||
project.setSn(licenseDO.getSerialNo());
|
||||
}
|
||||
List<LicenseDO> licenseDOS = licenseMapper.selectList(LicenseDO::getProjectId, project.getId());
|
||||
Optional<LicenseDO> first = licenseDOS.stream().findFirst();
|
||||
first.ifPresent(licenseDO -> project.setSn(licenseDO.getSerialNo()));
|
||||
}
|
||||
return success(BeanUtils.toBean(pageResult, ProjectRespVO.class));
|
||||
}
|
||||
|
||||
@@ -77,6 +77,9 @@ public class LicenseServiceImpl implements LicenseService {
|
||||
LicenseDO license = BeanUtils.toBean(createReqVO, LicenseDO.class);
|
||||
license.setStatus(LicenseStatusEnum.NOT_APPLIED.getCode());
|
||||
licenseMapper.insert(license);
|
||||
|
||||
createReqVO.setId(license.getId());
|
||||
applyLicense(createReqVO);
|
||||
// 返回
|
||||
return license.getId();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user