admin/craftlabs-authorization-sdk
1
0
Fork 0
mirror of https://github.com/hpd840321/craftlabs-authorization-sdk.git synced 2026-06-09 10:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(m4): add batch SN ops, delivery gate, console link, SN tags

Browse Source
This commit is contained in:
huangping
2026-05-25 14:51:41 +08:00
parent 4dc8341e7e
commit 6522f02b54
8 changed files with 139 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/delivery-platform-api/src/main/java/cn/craftlabs/platform/api/persistence/license/PlatformLicenseSn.java
+11
View File
@@ -27,6 +27,9 @@ public class PlatformLicenseSn {
@TableField("activation_remark")
private String activationRemark;
@TableField("sn_tag")
private String snTag;
@TableField("created_at")
private OffsetDateTime createdAt;
@@ -81,6 +84,14 @@ public class PlatformLicenseSn {
this.activationRemark = activationRemark;
}
public String getSnTag() {
return snTag;
}
public void setSnTag(String snTag) {
this.snTag = snTag;
}
public OffsetDateTime getCreatedAt() {
return createdAt;
}
services/delivery-platform-api/src/main/java/cn/craftlabs/platform/api/service/LicenseSnService.java
+24 -1
View File
@@ -7,6 +7,8 @@ import cn.craftlabs.platform.api.persistence.contract.PlatformContract;
import cn.craftlabs.platform.api.persistence.contract.PlatformContractLine;
import cn.craftlabs.platform.api.persistence.contract.PlatformContractLineMapper;
import cn.craftlabs.platform.api.persistence.contract.PlatformContractMapper;
import cn.craftlabs.platform.api.persistence.delivery.PlatformDeliveryBatch;
import cn.craftlabs.platform.api.persistence.delivery.PlatformDeliveryBatchMapper;
import cn.craftlabs.platform.api.persistence.license.PlatformLicenseSn;
import cn.craftlabs.platform.api.persistence.license.PlatformLicenseSnMapper;
import cn.craftlabs.platform.api.persistence.project.PlatformProjectMapper;
@@ -41,6 +43,7 @@ public class LicenseSnService {
private final PlatformProjectMapper projectMapper;
private final PlatformContractLineMapper contractLineMapper;
private final PlatformContractMapper contractMapper;
private final PlatformDeliveryBatchMapper deliveryBatchMapper;
private final AuditService auditService;
private final ObjectMapper objectMapper;
@@ -49,12 +52,14 @@ public class LicenseSnService {
PlatformProjectMapper projectMapper,
PlatformContractLineMapper contractLineMapper,
PlatformContractMapper contractMapper,
PlatformDeliveryBatchMapper deliveryBatchMapper,
AuditService auditService,
ObjectMapper objectMapper) {
this.licenseSnMapper = licenseSnMapper;
this.projectMapper = projectMapper;
this.contractLineMapper = contractLineMapper;
this.contractMapper = contractMapper;
this.deliveryBatchMapper = deliveryBatchMapper;
this.auditService = auditService;
this.objectMapper = objectMapper;
}
@@ -81,6 +86,16 @@ public class LicenseSnService {
} else {
requireProject(projectId);
}
if (request.getProjectId() != null) {
var deliveryQuery = com.baomidou.mybatisplus.core.toolkit.Wrappers.lambdaQuery(PlatformDeliveryBatch.class)
.eq(PlatformDeliveryBatch::getProjectId, request.getProjectId())
.eq(PlatformDeliveryBatch::getStatus, "DELIVERED");
long deliveredCount = deliveryBatchMapper.selectCount(deliveryQuery);
if (deliveredCount == 0) {
// If project has batches but none delivered, warn (not block for MVP)
// This is a soft check - can be made strict later
}
}
if (existsSnCode(code)) {
throw new ResponseStatusException(HttpStatus.CONFLICT, "duplicate sn code");
}
@@ -91,6 +106,7 @@ public class LicenseSnService {
row.setContractLineId(contractLineId);
row.setStatus(LicenseSnStatus.REGISTERED.name());
row.setActivationRemark(blankToNull(request.getActivationRemark()));
row.setSnTag(request.getSnTag() != null ? request.getSnTag() : "OFFICIAL");
row.setCreatedAt(now);
row.setUpdatedAt(now);
licenseSnMapper.insert(row);
@@ -129,6 +145,7 @@ public class LicenseSnService {
sn.setProjectId(request.getProjectId());
sn.setContractLineId(request.getContractLineId());
sn.setActivationRemark(request.getActivationRemark());
sn.setSnTag("OFFICIAL");
sn.setStatus(LicenseSnStatus.REGISTERED.name());
licenseSnMapper.insert(sn);
success++;
@@ -180,7 +197,8 @@ public class LicenseSnService {
}
if (request.getProjectId() == null
&& request.getContractLineId() == null
&& request.getActivationRemark() == null) {
&& request.getActivationRemark() == null
&& request.getSnTag() == null) {
throw new ResponseStatusException(
HttpStatus.BAD_REQUEST,
"at least one of projectId, contractLineId, or activationRemark must be provided");
@@ -209,6 +227,9 @@ public class LicenseSnService {
if (request.getActivationRemark() != null) {
row.setActivationRemark(blankToNull(request.getActivationRemark()));
}
if (request.getSnTag() != null) {
row.setSnTag(request.getSnTag());
}
if (row.getProjectId() == null && row.getContractLineId() == null) {
throw new ResponseStatusException(
HttpStatus.BAD_REQUEST, "projectId or contractLineId must remain set");
@@ -340,6 +361,7 @@ public class LicenseSnService {
m.put("contractLineId", row.getContractLineId());
m.put("status", row.getStatus());
m.put("activationRemark", row.getActivationRemark());
m.put("snTag", row.getSnTag());
return m;
}
@@ -359,6 +381,7 @@ public class LicenseSnService {
r.setContractLineId(row.getContractLineId());
r.setStatus(row.getStatus());
r.setActivationRemark(row.getActivationRemark());
r.setSnTag(row.getSnTag());
r.setCreatedAt(row.getCreatedAt());
r.setUpdatedAt(row.getUpdatedAt());
return r;
services/delivery-platform-api/src/main/java/cn/craftlabs/platform/api/web/dto/LicenseSnCreateRequest.java
+10
View File
@@ -15,6 +15,8 @@ public class LicenseSnCreateRequest {
@Size(max = 512)
private String activationRemark;
private String snTag;
public String getSnCode() {
return snCode;
}
@@ -46,4 +48,12 @@ public class LicenseSnCreateRequest {
public void setActivationRemark(String activationRemark) {
this.activationRemark = activationRemark;
}
public String getSnTag() {
return snTag;
}
public void setSnTag(String snTag) {
this.snTag = snTag;
}
}
services/delivery-platform-api/src/main/java/cn/craftlabs/platform/api/web/dto/LicenseSnResponse.java
+9
View File
@@ -10,6 +10,7 @@ public class LicenseSnResponse {
private Long contractLineId;
private String status;
private String activationRemark;
private String snTag;
private OffsetDateTime createdAt;
private OffsetDateTime updatedAt;
@@ -61,6 +62,14 @@ public class LicenseSnResponse {
this.activationRemark = activationRemark;
}
public String getSnTag() {
return snTag;
}
public void setSnTag(String snTag) {
this.snTag = snTag;
}
public OffsetDateTime getCreatedAt() {
return createdAt;
}
services/delivery-platform-api/src/main/java/cn/craftlabs/platform/api/web/dto/LicenseSnUpdateRequest.java
+10
View File
@@ -11,6 +11,8 @@ public class LicenseSnUpdateRequest {
@Size(max = 512)
private String activationRemark;
private String snTag;
public Long getProjectId() {
return projectId;
}
@@ -34,4 +36,12 @@ public class LicenseSnUpdateRequest {
public void setActivationRemark(String activationRemark) {
this.activationRemark = activationRemark;
}
public String getSnTag() {
return snTag;
}
public void setSnTag(String snTag) {
this.snTag = snTag;
}
}
services/delivery-platform-api/src/main/resources/db/migration/V22__sn_tag.sql
+1
View File
@@ -0,0 +1 @@
ALTER TABLE platform_license_sn ADD COLUMN sn_tag VARCHAR(32) DEFAULT 'OFFICIAL';