From 9e3bc846e880072f2ff7afc460ab2b4fa47aebd2 Mon Sep 17 00:00:00 2001 From: lxp <2770281812@qq.com> Date: Mon, 12 Oct 2026 11:56:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=8E=A5=E5=8F=A3=E8=81=8C?= =?UTF-8?q?=E8=B4=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/linkerbot/cadworld/AdminApiTest.java | 66 ++++++ .../service/UploadSignatureService.java | 74 ++++--- .../service/impl/ComponentConverter.java | 105 ++++++++++ .../service/impl/ComponentServiceImpl.java | 194 ++++++++---------- .../service/impl/ComponentUploadSupport.java | 50 +---- .../ComponentUploadSessionSupport.java | 84 ++++++++ .../service/UploadSignatureServiceTest.java | 11 +- .../impl/ComponentServiceImplTest.java | 9 +- .../impl/ComponentUploadSupportTest.java | 5 +- 9 files changed, 402 insertions(+), 196 deletions(-) create mode 100644 cadworld-service/src/main/java/com/linkerbot/cadworld/service/impl/ComponentConverter.java create mode 100644 cadworld-service/src/main/java/com/linkerbot/cadworld/service/support/ComponentUploadSessionSupport.java diff --git a/cadworld-adminapi/src/test/java/com/linkerbot/cadworld/AdminApiTest.java b/cadworld-adminapi/src/test/java/com/linkerbot/cadworld/AdminApiTest.java index 12bd663..8603d88 100644 --- a/cadworld-adminapi/src/test/java/com/linkerbot/cadworld/AdminApiTest.java +++ b/cadworld-adminapi/src/test/java/com/linkerbot/cadworld/AdminApiTest.java @@ -203,6 +203,72 @@ class AdminApiTest { assertThat(storage.objectExists(created.path("urdfMainObjectKey").asText())).isTrue(); } + @Test + void replacingBothModelsIsAtomicWhenOneUploadedFileIsMissing() throws Exception { + JsonNode created = create(uploaded()); + long id = created.path("id").asLong(); + JsonNode session = sign(Map.of("componentId", id)); + String step = session.path("step").path("keyPrefix").asText() + "replacement.STEP"; + String prefix = session.path("urdf").path("keyPrefix").asText(); + String main = prefix + "robot.urdf"; + String mesh = prefix + "meshes/new.stl"; + Map form = update(1); + form.put("uploadSessionToken", session.path("uploadSessionToken").asText()); + form.put("stepObjectKey", step); + form.put("urdfObjectKeys", List.of(main, mesh)); + storage.simulateDirectUpload(step, "application/octet-stream", new byte[]{1,2}); + storage.simulateDirectUpload(main, "application/xml", new byte[]{3}); + + expectUpdateError(id, form, 422, "COMPONENT_UPLOAD_OBJECT_MISSING"); + JsonNode afterFailure = data(mvc.perform(get("/admin-api/components/{id}", id)) + .andExpect(status().isOk()).andReturn()); + assertThat(afterFailure).isEqualTo(created); + + storage.simulateDirectUpload(mesh, "application/octet-stream", new byte[]{4,5,6}); + JsonNode changed = data(mvc.perform(put("/admin-api/components/{id}", id) + .contentType(MediaType.APPLICATION_JSON).content(json.writeValueAsString(form))) + .andExpect(status().isOk()).andReturn()); + assertThat(changed.path("componentCode")).isEqualTo(created.path("componentCode")); + assertThat(changed.path("version").asLong()).isEqualTo(2); + assertThat(changed.path("stepObjectKey").asText()).isEqualTo(step); + assertThat(changed.path("stepUrl").asText()).endsWith("replacement.STEP"); + assertThat(changed.path("urdfPrefix").asText()).isEqualTo(prefix); + assertThat(changed.path("urdfMainObjectKey").asText()).isEqualTo(main); + assertThat(changed.path("urdfFiles").get(1).path("relativePath").asText()).isEqualTo("meshes/new.stl"); + assertThat(changed.path("urdfFiles").get(1).path("sizeBytes").asLong()).isEqualTo(3); + assertThat(storage.objectExists(created.path("stepObjectKey").asText())).isTrue(); + assertThat(storage.objectExists(created.path("urdfMainObjectKey").asText())).isTrue(); + } + + @Test + void nullResourceFieldsPreserveModelsAndExistingValidationOrderIsRetained() throws Exception { + JsonNode created = create(uploaded()); + long id = created.path("id").asLong(); + JsonNode session = sign(Map.of("componentId", id)); + Map form = update(1); + form.put("stepObjectKey", null); + form.put("urdfObjectKeys", null); + form.put("uploadSessionToken", session.path("uploadSessionToken").asText()); + expectUpdateError(id, form, 422, "INVALID_COMPONENT_UPLOAD_OBJECT"); + form.put("componentCode", "CW-" + "F".repeat(32)); + expectUpdateError(id, form, 422, "COMPONENT_CODE_IMMUTABLE"); + + form.remove("componentCode"); + form.remove("uploadSessionToken"); + JsonNode changed = data(mvc.perform(put("/admin-api/components/{id}", id) + .contentType(MediaType.APPLICATION_JSON).content(json.writeValueAsString(form))) + .andExpect(status().isOk()).andReturn()); + assertThat(changed.path("version").asLong()).isEqualTo(2); + assertThat(changed.path("stepObjectKey")).isEqualTo(created.path("stepObjectKey")); + assertThat(changed.path("urdfPrefix")).isEqualTo(created.path("urdfPrefix")); + assertThat(changed.path("urdfMainObjectKey")).isEqualTo(created.path("urdfMainObjectKey")); + assertThat(changed.path("urdfFiles")).isEqualTo(created.path("urdfFiles")); + + form.put("uploadSessionToken", "invalid-upload-token"); + form.put("stepObjectKey", session.path("step").path("keyPrefix").asText() + "missing.step"); + expectUpdateError(id, form, 409, "COMPONENT_REVISION_CONFLICT"); + } + @Test void newAndExistingSessionsCannotBeUsedForAnotherComponent() throws Exception { JsonNode first = create(uploaded()); diff --git a/cadworld-service/src/main/java/com/linkerbot/cadworld/service/UploadSignatureService.java b/cadworld-service/src/main/java/com/linkerbot/cadworld/service/UploadSignatureService.java index c7d10f4..df70476 100644 --- a/cadworld-service/src/main/java/com/linkerbot/cadworld/service/UploadSignatureService.java +++ b/cadworld-service/src/main/java/com/linkerbot/cadworld/service/UploadSignatureService.java @@ -8,7 +8,7 @@ import com.linkerbot.cadworld.dto.storage.UploadSignatureResponse.UploadAuthoriz import com.linkerbot.cadworld.entity.Component; import com.linkerbot.cadworld.mapper.ComponentMapper; import com.linkerbot.cadworld.service.client.ObjectStorageClient; -import com.linkerbot.cadworld.service.impl.ComponentUploadSupport; +import com.linkerbot.cadworld.service.support.ComponentUploadSessionSupport; import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider; import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider.UploadSessionClaims; import java.time.Instant; @@ -24,43 +24,21 @@ import org.springframework.util.StringUtils; @Slf4j @RequiredArgsConstructor public class UploadSignatureService { - private final ComponentUploadSupport support; + private final ComponentUploadSessionSupport sessions; private final ComponentUploadSessionTokenProvider tokens; private final ObjectStorageClient storage; private final ComponentMapper components; public UploadSignatureResponse sign(Long userId, UploadSignatureRequest request) { - UploadSessionClaims session; - String token; boolean renewal = request.uploadSessionToken() != null; - if (renewal) { - if (request.componentId() != null || !StringUtils.hasText(request.uploadSessionToken())) { - throw new BizException(422, "INVALID_UPLOAD_SIGNATURE_REQUEST", "续签只能提供非空的uploadSessionToken"); - } - token = request.uploadSessionToken(); - session = support.requireUploadSession(userId, token); - if (session.componentId() != null) { - Component component = components.selectById(session.componentId()); - if (component == null) throw new BizException(404, "COMPONENT_NOT_FOUND", "组件不存在"); - support.requireComponent(session, component.getId(), component.getComponentCode()); - } - } else { - String code; - if (request.componentId() == null) { - code = "CW-" + randomId().toUpperCase(Locale.ROOT); - } else { - Component component = components.selectById(request.componentId()); - if (component == null) throw new BizException(404, "COMPONENT_NOT_FOUND", "组件不存在"); - code = component.getComponentCode(); - } - String batch = randomId(); - Instant expiry = Instant.now().truncatedTo(ChronoUnit.SECONDS).plus(support.sessionTtl()); - session = new UploadSessionClaims(userId, request.componentId(), code, batch, - support.prefix(code, batch, "step"), support.prefix(code, batch, "urdf"), expiry); - token = tokens.generateToken(session); + UploadSessionClaims session = renewal + ? renewSession(userId, request) + : createSession(userId, request.componentId()); + String token = renewal ? request.uploadSessionToken() : tokens.generateToken(session); + Instant expiresAt = Instant.now().plus(sessions.signatureTtl()); + if (expiresAt.isAfter(session.expiresAt())) { + expiresAt = session.expiresAt(); } - Instant expiresAt = Instant.now().plus(support.signatureTtl()); - if (expiresAt.isAfter(session.expiresAt())) expiresAt = session.expiresAt(); UploadAuthorization step = authorize(session.stepPrefix(), expiresAt); UploadAuthorization urdf = authorize(session.urdfPrefix(), expiresAt); log.info("组件上传签名完成 componentCode={} componentId={} renewal={} userId={} requestId={} expiresAt={}", @@ -68,10 +46,42 @@ public class UploadSignatureService { return new UploadSignatureResponse(session.componentCode(), token, session.expiresAt(), expiresAt, step, urdf); } + private UploadSessionClaims createSession(Long userId, Long componentId) { + String code = componentId == null + ? "CW-" + randomId().toUpperCase(Locale.ROOT) + : requireComponent(componentId).getComponentCode(); + String batch = randomId(); + Instant expiry = Instant.now().truncatedTo(ChronoUnit.SECONDS).plus(sessions.sessionTtl()); + return new UploadSessionClaims(userId, componentId, code, batch, + sessions.prefix(code, batch, "step"), sessions.prefix(code, batch, "urdf"), expiry); + } + + private UploadSessionClaims renewSession(Long userId, UploadSignatureRequest request) { + if (request.componentId() != null || !StringUtils.hasText(request.uploadSessionToken())) { + throw new BizException(422, "INVALID_UPLOAD_SIGNATURE_REQUEST", "续签只能提供非空的uploadSessionToken"); + } + UploadSessionClaims session = sessions.requireUploadSession(userId, request.uploadSessionToken()); + if (session.componentId() != null) { + Component component = requireComponent(session.componentId()); + sessions.requireComponent(session, component.getId(), component.getComponentCode()); + } + return session; + } + + private Component requireComponent(Long componentId) { + Component component = components.selectById(componentId); + if (component == null) { + throw new BizException(404, "COMPONENT_NOT_FOUND", "组件不存在"); + } + return component; + } + private UploadAuthorization authorize(String prefix, Instant expiresAt) { ObjectStorageClient.UploadAuthorization authorization = storage.createUploadAuthorization(prefix, expiresAt); return new UploadAuthorization(authorization.uploadUrl(), prefix, authorization.uploadFields(), "POST"); } - private String randomId() { return UUID.randomUUID().toString().replace("-", ""); } + private String randomId() { + return UUID.randomUUID().toString().replace("-", ""); + } } diff --git a/cadworld-service/src/main/java/com/linkerbot/cadworld/service/impl/ComponentConverter.java b/cadworld-service/src/main/java/com/linkerbot/cadworld/service/impl/ComponentConverter.java new file mode 100644 index 0000000..ec74614 --- /dev/null +++ b/cadworld-service/src/main/java/com/linkerbot/cadworld/service/impl/ComponentConverter.java @@ -0,0 +1,105 @@ +package com.linkerbot.cadworld.service.impl; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.linkerbot.cadworld.common.exception.BizException; +import com.linkerbot.cadworld.dto.component.ComponentForm; +import com.linkerbot.cadworld.dto.component.ComponentListItemResponse; +import com.linkerbot.cadworld.dto.component.ComponentResponse; +import com.linkerbot.cadworld.dto.component.CustomField; +import com.linkerbot.cadworld.dto.component.UrdfFile; +import com.linkerbot.cadworld.entity.Component; +import com.linkerbot.cadworld.service.impl.ComponentUploadSupport.VerifiedUrdf; +import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import lombok.RequiredArgsConstructor; + +/** 集中处理组件表单归一化、JSON 字段和响应转换。 */ +@org.springframework.stereotype.Component +@RequiredArgsConstructor +public class ComponentConverter { + private static final TypeReference> TAGS = new TypeReference<>() { }; + private static final TypeReference> FIELDS = new TypeReference<>() { }; + private static final TypeReference> FILES = new TypeReference<>() { }; + + private final ObjectMapper objectMapper; + private final ObjectStorageUrlResolver urls; + + public void applyForm(Component component, ComponentForm form) { + component.setComponentName(text(form.componentName())); + component.setCategory(text(form.category())); + component.setManufacturer(text(form.manufacturer())); + String description = form.description() == null ? "" : form.description(); + if (description.getBytes(StandardCharsets.UTF_8).length > 65535) { + throw new BizException(422, "INVALID_COMPONENT_FORM", "零件说明超过TEXT字段容量"); + } + component.setDescription(description); + component.setMaterial(text(form.material())); + component.setMassKg(number(form.massKg())); + component.setLengthMm(number(form.lengthMm())); + component.setWidthMm(number(form.widthMm())); + component.setHeightMm(number(form.heightMm())); + List tags = form.tags() == null ? List.of() : form.tags().stream() + .filter(Objects::nonNull).map(String::trim).filter(tag -> !tag.isEmpty()).distinct().toList(); + component.setTags(objectMapper.valueToTree(tags)); + component.setBasicFields(objectMapper.valueToTree(fields(form.basicFields()))); + component.setParameterFields(objectMapper.valueToTree(fields(form.parameterFields()))); + } + + public void applyUrdf(Component component, VerifiedUrdf urdf) { + component.setUrdfPrefix(urdf.prefix()); + component.setUrdfMainObjectKey(urdf.mainObjectKey()); + component.setUrdfFiles(objectMapper.valueToTree(urdf.files())); + } + + public ComponentResponse toResponse(Component component) { + return new ComponentResponse(component.getId(), component.getComponentCode(), component.getComponentName(), + component.getCategory(), component.getManufacturer(), component.getDescription(), component.getMaterial(), + component.getMassKg(), component.getLengthMm(), component.getWidthMm(), component.getHeightMm(), + read(component.getTags(), TAGS), read(component.getBasicFields(), FIELDS), + read(component.getParameterFields(), FIELDS), component.getStepObjectKey(), + urls.resolvePublicUrl(component.getStepObjectKey()), component.getUrdfPrefix(), + urls.resolvePublicUrl(component.getUrdfPrefix()), component.getUrdfMainObjectKey(), + urls.resolvePublicUrl(component.getUrdfMainObjectKey()), read(component.getUrdfFiles(), FILES), + component.getVersion(), component.getCreatedAt(), component.getUpdatedAt()); + } + + public ComponentListItemResponse toListItem(Component component) { + return new ComponentListItemResponse(component.getId(), component.getComponentCode(), component.getComponentName(), + component.getCategory(), component.getManufacturer(), component.getDescription(), + read(component.getTags(), TAGS), urls.resolvePublicUrl(component.getStepObjectKey()), + urls.resolvePublicUrl(component.getUrdfMainObjectKey()), component.getVersion(), + component.getCreatedAt(), component.getUpdatedAt()); + } + + private List fields(List source) { + if (source == null) { + return List.of(); + } + Set names = new HashSet<>(); + return source.stream().map(field -> { + String name = text(field.name()); + if (!names.add(name)) { + throw new BizException(422, "DUPLICATE_CUSTOM_FIELD", "同一表单中的自定义字段名不可重复"); + } + return new CustomField(name, field.value()); + }).toList(); + } + + private List read(JsonNode node, TypeReference> type) { + return node == null ? List.of() : objectMapper.convertValue(node, type); + } + + private String text(String value) { + return value == null ? "" : value.trim(); + } + + private BigDecimal number(BigDecimal value) { + return value == null ? BigDecimal.ZERO : value; + } +} diff --git a/cadworld-service/src/main/java/com/linkerbot/cadworld/service/impl/ComponentServiceImpl.java b/cadworld-service/src/main/java/com/linkerbot/cadworld/service/impl/ComponentServiceImpl.java index bbde0ac..0820763 100644 --- a/cadworld-service/src/main/java/com/linkerbot/cadworld/service/impl/ComponentServiceImpl.java +++ b/cadworld-service/src/main/java/com/linkerbot/cadworld/service/impl/ComponentServiceImpl.java @@ -3,24 +3,21 @@ package com.linkerbot.cadworld.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import com.linkerbot.cadworld.common.api.OperationTargetHolder; import com.linkerbot.cadworld.common.api.PageResponse; import com.linkerbot.cadworld.common.api.RequestIdHolder; import com.linkerbot.cadworld.common.exception.BizException; -import com.linkerbot.cadworld.dto.component.*; +import com.linkerbot.cadworld.dto.component.ComponentListItemResponse; +import com.linkerbot.cadworld.dto.component.ComponentResponse; +import com.linkerbot.cadworld.dto.component.CreateComponentRequest; +import com.linkerbot.cadworld.dto.component.UpdateComponentRequest; import com.linkerbot.cadworld.entity.Component; import com.linkerbot.cadworld.mapper.ComponentMapper; import com.linkerbot.cadworld.service.ComponentService; +import com.linkerbot.cadworld.service.support.ComponentUploadSessionSupport; import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider.UploadSessionClaims; -import java.math.BigDecimal; -import java.nio.charset.StandardCharsets; -import java.util.HashSet; import java.util.List; import java.util.Objects; -import java.util.Set; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.dao.DuplicateKeyException; @@ -31,34 +28,21 @@ import org.springframework.transaction.support.TransactionTemplate; @Slf4j @RequiredArgsConstructor public class ComponentServiceImpl implements ComponentService { - private static final TypeReference> TAGS = new TypeReference<>() { }; - private static final TypeReference> FIELDS = new TypeReference<>() { }; - private static final TypeReference> FILES = new TypeReference<>() { }; private final ComponentMapper componentMapper; - private final ObjectMapper objectMapper; - private final ObjectStorageUrlResolver urls; + private final ComponentConverter converter; + private final ComponentUploadSessionSupport sessions; private final ComponentUploadSupport uploads; private final TransactionTemplate transactions; @Override public ComponentResponse createComponent(Long userId, CreateComponentRequest request) { - UploadSessionClaims session = uploads.requireUploadSession(userId, request.uploadSessionToken()); - uploads.requireComponent(session, null, session.componentCode()); - OperationTargetHolder.set("COMPONENT", "", session.componentCode(), text(request.componentName())); - Component component = new Component(); - component.setComponentCode(session.componentCode()); - applyForm(component, request); - component.setStepObjectKey(uploads.verifyStep(session, request.stepObjectKey())); - applyUrdf(component, uploads.verifyUrdf(session, request.urdfObjectKeys())); - component.setVersion(1L); - log.info("组件上传资源校验完成 componentCode={} urdfFileCount={} requestId={}", - component.getComponentCode(), request.urdfObjectKeys().size(), RequestIdHolder.get()); + Component component = prepareCreate(userId, request); ComponentResponse response; try { response = transactions.execute(status -> { componentMapper.insert(component); snapshot(component); - return detail(require(component.getId())); + return converter.toResponse(require(component.getId())); }); } catch (DuplicateKeyException exception) { throw new BizException(409, "COMPONENT_CODE_DUPLICATE", "组件编码已存在,请勿重复新增"); @@ -72,32 +56,18 @@ public class ComponentServiceImpl implements ComponentService { public ComponentResponse updateComponent(Long userId, Long id, UpdateComponentRequest request) { Component current = require(id); snapshot(current); - if (request.componentCode() != null && !Objects.equals(current.getComponentCode(), request.componentCode())) { - throw new BizException(422, "COMPONENT_CODE_IMMUTABLE", "组件编码不可修改"); - } - if (!Objects.equals(current.getVersion(), request.version())) throw revisionConflict(); - if (current.getVersion() >= 4294967295L) { - throw new BizException(409, "COMPONENT_REVISION_CONFLICT", "组件版本已达到上限"); - } - boolean replacing = request.stepObjectKey() != null || request.urdfObjectKeys() != null; - if (replacing) { - UploadSessionClaims session = uploads.requireUploadSession(userId, request.uploadSessionToken()); - uploads.requireComponent(session, id, current.getComponentCode()); - if (request.stepObjectKey() != null) current.setStepObjectKey(uploads.verifyStep(session, request.stepObjectKey())); - if (request.urdfObjectKeys() != null) applyUrdf(current, uploads.verifyUrdf(session, request.urdfObjectKeys())); - log.info("组件替换资源校验完成 componentId={} replaceStep={} replaceUrdf={} requestId={}", - id, request.stepObjectKey() != null, request.urdfObjectKeys() != null, RequestIdHolder.get()); - } else if (request.uploadSessionToken() != null) { - throw new BizException(422, "INVALID_COMPONENT_UPLOAD_OBJECT", "上传令牌须与替换文件清单一起提交"); - } - applyForm(current, request); + validateUpdate(current, request); + replaceResources(userId, current, request); + converter.applyForm(current, request); current.setVersion(request.version() + 1); ComponentResponse response = transactions.execute(status -> { int changed = componentMapper.update(current, new LambdaUpdateWrapper() .eq(Component::getId, id).eq(Component::getVersion, request.version())); - if (changed != 1) throw revisionConflict(); + if (changed != 1) { + throw revisionConflict(); + } snapshot(current); - return detail(require(id)); + return converter.toResponse(require(id)); }); log.info("组件修改成功 componentId={} version={} userId={} requestId={}", id, current.getVersion(), userId, RequestIdHolder.get()); @@ -109,100 +79,110 @@ public class ComponentServiceImpl implements ComponentService { transactions.executeWithoutResult(status -> { Component current = componentMapper.selectOne(new LambdaQueryWrapper() .eq(Component::getId, id).last("FOR UPDATE")); - if (current == null) throw notFound(); + if (current == null) { + throw notFound(); + } snapshot(current); - if (componentMapper.deleteById(id) != 1) throw notFound(); + if (componentMapper.deleteById(id) != 1) { + throw notFound(); + } }); log.info("组件删除成功 componentId={} userId={} requestId={}", id, userId, RequestIdHolder.get()); } @Override - public ComponentResponse getComponent(Long id) { return detail(require(id)); } + public ComponentResponse getComponent(Long id) { + return converter.toResponse(require(id)); + } @Override public PageResponse listComponents(long page, long size, String keyword, String category) { + String normalizedKeyword = text(keyword); + String normalizedCategory = text(category); LambdaQueryWrapper query = new LambdaQueryWrapper() .select(Component::getId, Component::getComponentCode, Component::getComponentName, Component::getCategory, Component::getManufacturer, Component::getDescription, Component::getTags, Component::getStepObjectKey, Component::getUrdfMainObjectKey, Component::getVersion, Component::getCreatedAt, Component::getUpdatedAt) - .eq(!text(category).isEmpty(), Component::getCategory, text(category)); - if (!text(keyword).isEmpty()) { - query.and(q -> q.like(Component::getComponentName, text(keyword)) - .or().like(Component::getComponentCode, text(keyword))); + .eq(!normalizedCategory.isEmpty(), Component::getCategory, normalizedCategory); + if (!normalizedKeyword.isEmpty()) { + query.and(condition -> condition.like(Component::getComponentName, normalizedKeyword) + .or().like(Component::getComponentCode, normalizedKeyword)); } Page result = componentMapper.selectPage(new Page<>(page, size), query.orderByDesc(Component::getUpdatedAt).orderByDesc(Component::getId)); - List items = result.getRecords().stream().map(c -> new ComponentListItemResponse(c.getId(), - c.getComponentCode(), c.getComponentName(), c.getCategory(), c.getManufacturer(), - c.getDescription(), read(c.getTags(), TAGS), urls.resolvePublicUrl(c.getStepObjectKey()), - urls.resolvePublicUrl(c.getUrdfMainObjectKey()), c.getVersion(), - c.getCreatedAt(), c.getUpdatedAt())).toList(); + List items = result.getRecords().stream().map(converter::toListItem).toList(); return new PageResponse<>(items, page, size, result.getTotal()); } - private void applyForm(Component component, ComponentForm form) { - component.setComponentName(text(form.componentName())); - component.setCategory(text(form.category())); - component.setManufacturer(text(form.manufacturer())); - String description = form.description() == null ? "" : form.description(); - if (description.getBytes(StandardCharsets.UTF_8).length > 65535) { - throw new BizException(422, "INVALID_COMPONENT_FORM", "零件说明超过TEXT字段容量"); + private Component prepareCreate(Long userId, CreateComponentRequest request) { + UploadSessionClaims session = sessions.requireForCreate(userId, request.uploadSessionToken()); + OperationTargetHolder.set("COMPONENT", "", session.componentCode(), text(request.componentName())); + Component component = new Component(); + component.setComponentCode(session.componentCode()); + converter.applyForm(component, request); + component.setStepObjectKey(uploads.verifyStep(session, request.stepObjectKey())); + converter.applyUrdf(component, uploads.verifyUrdf(session, request.urdfObjectKeys())); + component.setVersion(1L); + log.info("组件上传资源校验完成 componentCode={} urdfFileCount={} requestId={}", + component.getComponentCode(), request.urdfObjectKeys().size(), RequestIdHolder.get()); + return component; + } + + private void validateUpdate(Component current, UpdateComponentRequest request) { + if (request.componentCode() != null && !Objects.equals(current.getComponentCode(), request.componentCode())) { + throw new BizException(422, "COMPONENT_CODE_IMMUTABLE", "组件编码不可修改"); + } + if (!Objects.equals(current.getVersion(), request.version())) { + throw revisionConflict(); + } + if (current.getVersion() >= 4294967295L) { + throw new BizException(409, "COMPONENT_REVISION_CONFLICT", "组件版本已达到上限"); } - component.setDescription(description); - component.setMaterial(text(form.material())); - component.setMassKg(number(form.massKg())); - component.setLengthMm(number(form.lengthMm())); - component.setWidthMm(number(form.widthMm())); - component.setHeightMm(number(form.heightMm())); - component.setTags(objectMapper.valueToTree(form.tags() == null ? List.of() - : form.tags().stream().filter(Objects::nonNull).map(String::trim).filter(t -> !t.isEmpty()).distinct().toList())); - component.setBasicFields(objectMapper.valueToTree(fields(form.basicFields()))); - component.setParameterFields(objectMapper.valueToTree(fields(form.parameterFields()))); } - private List fields(List source) { - if (source == null) return List.of(); - Set names = new HashSet<>(); - return source.stream().map(field -> { - String name = text(field.name()); - if (!names.add(name)) throw new BizException(422, "DUPLICATE_CUSTOM_FIELD", "同一表单中的自定义字段名不可重复"); - return new CustomField(name, field.value()); - }).toList(); - } - - private void applyUrdf(Component component, ComponentUploadSupport.VerifiedUrdf urdf) { - component.setUrdfPrefix(urdf.prefix()); - component.setUrdfMainObjectKey(urdf.mainObjectKey()); - component.setUrdfFiles(objectMapper.valueToTree(urdf.files())); - } - - private ComponentResponse detail(Component c) { - return new ComponentResponse(c.getId(), c.getComponentCode(), c.getComponentName(), c.getCategory(), - c.getManufacturer(), c.getDescription(), c.getMaterial(), c.getMassKg(), c.getLengthMm(), - c.getWidthMm(), c.getHeightMm(), read(c.getTags(), TAGS), read(c.getBasicFields(), FIELDS), - read(c.getParameterFields(), FIELDS), c.getStepObjectKey(), urls.resolvePublicUrl(c.getStepObjectKey()), - c.getUrdfPrefix(), urls.resolvePublicUrl(c.getUrdfPrefix()), c.getUrdfMainObjectKey(), - urls.resolvePublicUrl(c.getUrdfMainObjectKey()), read(c.getUrdfFiles(), FILES), - c.getVersion(), c.getCreatedAt(), c.getUpdatedAt()); - } - - private List read(JsonNode node, TypeReference> type) { - return node == null ? List.of() : objectMapper.convertValue(node, type); + private void replaceResources(Long userId, Component current, UpdateComponentRequest request) { + boolean replaceStep = request.stepObjectKey() != null; + boolean replaceUrdf = request.urdfObjectKeys() != null; + if (!replaceStep && !replaceUrdf) { + if (request.uploadSessionToken() != null) { + throw new BizException(422, "INVALID_COMPONENT_UPLOAD_OBJECT", "上传令牌须与替换文件清单一起提交"); + } + return; + } + UploadSessionClaims session = sessions.requireForComponent(userId, request.uploadSessionToken(), + current.getId(), current.getComponentCode()); + if (replaceStep) { + current.setStepObjectKey(uploads.verifyStep(session, request.stepObjectKey())); + } + if (replaceUrdf) { + converter.applyUrdf(current, uploads.verifyUrdf(session, request.urdfObjectKeys())); + } + log.info("组件替换资源校验完成 componentId={} replaceStep={} replaceUrdf={} requestId={}", + current.getId(), replaceStep, replaceUrdf, RequestIdHolder.get()); } private Component require(Long id) { Component component = componentMapper.selectById(id); - if (component == null) throw notFound(); + if (component == null) { + throw notFound(); + } return component; } + private void snapshot(Component component) { OperationTargetHolder.set("COMPONENT", component.getId() == null ? "" : component.getId().toString(), component.getComponentCode(), component.getComponentName()); } - private String text(String value) { return value == null ? "" : value.trim(); } - private BigDecimal number(BigDecimal value) { return value == null ? BigDecimal.ZERO : value; } - private BizException notFound() { return new BizException(404, "COMPONENT_NOT_FOUND", "组件不存在"); } + + private String text(String value) { + return value == null ? "" : value.trim(); + } + + private BizException notFound() { + return new BizException(404, "COMPONENT_NOT_FOUND", "组件不存在"); + } + private BizException revisionConflict() { return new BizException(409, "COMPONENT_REVISION_CONFLICT", "组件已修改或删除,请刷新后保存"); } diff --git a/cadworld-service/src/main/java/com/linkerbot/cadworld/service/impl/ComponentUploadSupport.java b/cadworld-service/src/main/java/com/linkerbot/cadworld/service/impl/ComponentUploadSupport.java index 7658cee..49eea7b 100644 --- a/cadworld-service/src/main/java/com/linkerbot/cadworld/service/impl/ComponentUploadSupport.java +++ b/cadworld-service/src/main/java/com/linkerbot/cadworld/service/impl/ComponentUploadSupport.java @@ -5,68 +5,24 @@ import com.linkerbot.cadworld.config.StorageProperties; import com.linkerbot.cadworld.dto.component.UrdfFile; import com.linkerbot.cadworld.service.client.ObjectStorageClient; import com.linkerbot.cadworld.service.client.ObjectStorageClient.StoredObject; -import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider; import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider.UploadSessionClaims; import com.linkerbot.cadworld.service.support.StorageObjectKeys; import com.linkerbot.cadworld.service.support.UploadLimits; -import io.jsonwebtoken.JwtException; -import java.time.Duration; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Locale; -import java.util.Objects; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; +/** 校验已上传的 STEP 和 URDF 文件,不处理上传令牌或数据库写入。 */ @Component @RequiredArgsConstructor public class ComponentUploadSupport { private final StorageProperties properties; private final ObjectStorageClient storage; - private final ComponentUploadSessionTokenProvider tokens; private final StorageObjectKeys keys; - public UploadSessionClaims requireUploadSession(Long userId, String token) { - try { - if (!StringUtils.hasText(token)) throw invalidSession(); - UploadSessionClaims session = tokens.parseToken(token); - if (!Objects.equals(userId, session.userId()) - || session.componentCode() == null || !session.componentCode().matches("CW-[A-F0-9]{32}") - || session.batch() == null || !session.batch().matches("[a-f0-9]{32}") - || (session.componentId() != null && session.componentId() <= 0) - || !prefix(session.componentCode(), session.batch(), "step").equals(session.stepPrefix()) - || !prefix(session.componentCode(), session.batch(), "urdf").equals(session.urdfPrefix())) { - throw invalidSession(); - } - return session; - } catch (JwtException | IllegalArgumentException exception) { - throw invalidSession(); - } - } - - public String prefix(String code, String batch, String kind) { - return keys.requirePrefix(keys.underRoot("components/" + code + "/" + kind + "/" + batch) + "/"); - } - - public void requireComponent(UploadSessionClaims session, Long id, String code) { - if (!Objects.equals(session.componentId(), id) || !Objects.equals(session.componentCode(), code)) { - throw invalidSession(); - } - } - - public Duration sessionTtl() { return positiveTtl(properties.uploadSessionTtl(), Duration.ofMinutes(30)); } - public Duration signatureTtl() { return positiveTtl(properties.uploadSignatureTtl(), Duration.ofMinutes(5)); } - - private Duration positiveTtl(Duration value, Duration fallback) { - Duration ttl = value == null ? fallback : value; - if (ttl.isZero() || ttl.isNegative()) { - throw new BizException(500, "STORAGE_CONFIG_ERROR", "上传有效期配置必须大于零"); - } - return ttl; - } - public String verifyStep(UploadSessionClaims session, String submittedKey) { String key = validateSessionObjectKey(session.stepPrefix(), submittedKey); String path = key.substring(session.stepPrefix().length()); @@ -119,10 +75,6 @@ public class ComponentUploadSupport { return key; } - private BizException invalidSession() { - return new BizException(422, "INVALID_COMPONENT_UPLOAD_SESSION", "上传会话无效、已过期或与当前组件不匹配"); - } - private BizException invalidObject(String message) { return new BizException(422, "INVALID_COMPONENT_UPLOAD_OBJECT", message); } diff --git a/cadworld-service/src/main/java/com/linkerbot/cadworld/service/support/ComponentUploadSessionSupport.java b/cadworld-service/src/main/java/com/linkerbot/cadworld/service/support/ComponentUploadSessionSupport.java new file mode 100644 index 0000000..29ffa9a --- /dev/null +++ b/cadworld-service/src/main/java/com/linkerbot/cadworld/service/support/ComponentUploadSessionSupport.java @@ -0,0 +1,84 @@ +package com.linkerbot.cadworld.service.support; + +import com.linkerbot.cadworld.common.exception.BizException; +import com.linkerbot.cadworld.config.StorageProperties; +import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider.UploadSessionClaims; +import io.jsonwebtoken.JwtException; +import java.time.Duration; +import java.util.Objects; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +/** 管理上传会话的归属、目录和有效期,不读取 OSS 文件。 */ +@Component +@RequiredArgsConstructor +public class ComponentUploadSessionSupport { + private final StorageProperties properties; + private final ComponentUploadSessionTokenProvider tokens; + private final StorageObjectKeys keys; + + public UploadSessionClaims requireForCreate(Long userId, String token) { + UploadSessionClaims session = requireUploadSession(userId, token); + if (session.componentId() != null) { + throw invalidSession(); + } + return session; + } + + public UploadSessionClaims requireForComponent(Long userId, String token, Long id, String code) { + UploadSessionClaims session = requireUploadSession(userId, token); + requireComponent(session, id, code); + return session; + } + + public UploadSessionClaims requireUploadSession(Long userId, String token) { + try { + if (!StringUtils.hasText(token)) { + throw invalidSession(); + } + UploadSessionClaims session = tokens.parseToken(token); + if (!Objects.equals(userId, session.userId()) + || session.componentCode() == null || !session.componentCode().matches("CW-[A-F0-9]{32}") + || session.batch() == null || !session.batch().matches("[a-f0-9]{32}") + || (session.componentId() != null && session.componentId() <= 0) + || !prefix(session.componentCode(), session.batch(), "step").equals(session.stepPrefix()) + || !prefix(session.componentCode(), session.batch(), "urdf").equals(session.urdfPrefix())) { + throw invalidSession(); + } + return session; + } catch (JwtException | IllegalArgumentException exception) { + throw invalidSession(); + } + } + + public void requireComponent(UploadSessionClaims session, Long id, String code) { + if (!Objects.equals(session.componentId(), id) || !Objects.equals(session.componentCode(), code)) { + throw invalidSession(); + } + } + + public String prefix(String code, String batch, String kind) { + return keys.requirePrefix(keys.underRoot("components/" + code + "/" + kind + "/" + batch) + "/"); + } + + public Duration sessionTtl() { + return positiveTtl(properties.uploadSessionTtl(), Duration.ofMinutes(30)); + } + + public Duration signatureTtl() { + return positiveTtl(properties.uploadSignatureTtl(), Duration.ofMinutes(5)); + } + + private Duration positiveTtl(Duration value, Duration fallback) { + Duration ttl = value == null ? fallback : value; + if (ttl.isZero() || ttl.isNegative()) { + throw new BizException(500, "STORAGE_CONFIG_ERROR", "上传有效期配置必须大于零"); + } + return ttl; + } + + private BizException invalidSession() { + return new BizException(422, "INVALID_COMPONENT_UPLOAD_SESSION", "上传会话无效、已过期或与当前组件不匹配"); + } +} diff --git a/cadworld-service/src/test/java/com/linkerbot/cadworld/service/UploadSignatureServiceTest.java b/cadworld-service/src/test/java/com/linkerbot/cadworld/service/UploadSignatureServiceTest.java index f8047ed..7c5f3e5 100644 --- a/cadworld-service/src/test/java/com/linkerbot/cadworld/service/UploadSignatureServiceTest.java +++ b/cadworld-service/src/test/java/com/linkerbot/cadworld/service/UploadSignatureServiceTest.java @@ -7,7 +7,6 @@ import com.linkerbot.cadworld.dto.storage.UploadSignatureResponse; import com.linkerbot.cadworld.entity.Component; import com.linkerbot.cadworld.mapper.ComponentMapper; import com.linkerbot.cadworld.service.client.ObjectStorageClient; -import com.linkerbot.cadworld.service.impl.ComponentUploadSupport; import com.linkerbot.cadworld.service.support.*; import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider.UploadSessionClaims; import java.time.*; @@ -25,8 +24,8 @@ class UploadSignatureServiceTest { final ComponentMapper mapper = mock(ComponentMapper.class); final ComponentUploadSessionTokenProvider tokens = new ComponentUploadSessionTokenProvider( new UploadSessionProperties("upload","test-upload-signing-key-32-bytes-long")); - final ComponentUploadSupport support = new ComponentUploadSupport(properties,storage,tokens,new StorageObjectKeys(properties)); - final UploadSignatureService service = new UploadSignatureService(support,tokens,storage,mapper); + final ComponentUploadSessionSupport sessions = new ComponentUploadSessionSupport(properties,tokens,new StorageObjectKeys(properties)); + final UploadSignatureService service = new UploadSignatureService(sessions,tokens,storage,mapper); @BeforeEach void authorize() { @@ -79,6 +78,12 @@ class UploadSignatureServiceTest { assertThat(first.componentCode()).isEqualTo(component.getComponentCode()); assertThat(second.step().keyPrefix()).isNotEqualTo(first.step().keyPrefix()); assertThat(tokens.parseToken(first.uploadSessionToken()).componentId()).isEqualTo(123L); + UploadSignatureResponse renewed = service.sign(7L,new UploadSignatureRequest(null,first.uploadSessionToken())); + assertThat(renewed.uploadSessionToken()).isEqualTo(first.uploadSessionToken()); + assertThat(renewed.componentCode()).isEqualTo(first.componentCode()); + assertThat(renewed.sessionExpiresAt()).isEqualTo(first.sessionExpiresAt()); + assertThat(renewed.step().keyPrefix()).isEqualTo(first.step().keyPrefix()); + assertThat(renewed.urdf().keyPrefix()).isEqualTo(first.urdf().keyPrefix()); when(mapper.selectById(123L)).thenReturn(null); assertThatThrownBy(() -> service.sign(7L,new UploadSignatureRequest(null,first.uploadSessionToken()))) .isInstanceOf(BizException.class).extracting("httpStatus").isEqualTo(404); diff --git a/cadworld-service/src/test/java/com/linkerbot/cadworld/service/impl/ComponentServiceImplTest.java b/cadworld-service/src/test/java/com/linkerbot/cadworld/service/impl/ComponentServiceImplTest.java index 6487ad5..e06dc75 100644 --- a/cadworld-service/src/test/java/com/linkerbot/cadworld/service/impl/ComponentServiceImplTest.java +++ b/cadworld-service/src/test/java/com/linkerbot/cadworld/service/impl/ComponentServiceImplTest.java @@ -7,6 +7,7 @@ import com.linkerbot.cadworld.config.StorageProperties; import com.linkerbot.cadworld.dto.component.UpdateComponentRequest; import com.linkerbot.cadworld.entity.Component; import com.linkerbot.cadworld.mapper.ComponentMapper; +import com.linkerbot.cadworld.service.support.ComponentUploadSessionSupport; import java.time.Duration; import org.junit.jupiter.api.Test; import org.springframework.transaction.PlatformTransactionManager; @@ -26,9 +27,11 @@ class ComponentServiceImplTest { when(mapper.update(any(Component.class),any(com.baomidou.mybatisplus.core.conditions.Wrapper.class))).thenReturn(0); PlatformTransactionManager manager = mock(PlatformTransactionManager.class); when(manager.getTransaction(any())).thenReturn(new SimpleTransactionStatus()); - ComponentServiceImpl service = new ComponentServiceImpl(mapper,new ObjectMapper(), - new ObjectStorageUrlResolver(new StorageProperties("cadworld_dev","http://localhost", - Duration.ofMinutes(30),Duration.ofMinutes(5),1024)), + ComponentServiceImpl service = new ComponentServiceImpl(mapper, + new ComponentConverter(new ObjectMapper(), + new ObjectStorageUrlResolver(new StorageProperties("cadworld_dev","http://localhost", + Duration.ofMinutes(30),Duration.ofMinutes(5),1024))), + mock(ComponentUploadSessionSupport.class), mock(ComponentUploadSupport.class),new TransactionTemplate(manager)); UpdateComponentRequest request = new UpdateComponentRequest(null,"测试","分类",null,null,null, null,null,null,null,null,null,null,1L,null,null,null); diff --git a/cadworld-service/src/test/java/com/linkerbot/cadworld/service/impl/ComponentUploadSupportTest.java b/cadworld-service/src/test/java/com/linkerbot/cadworld/service/impl/ComponentUploadSupportTest.java index 6553c92..3a2a331 100644 --- a/cadworld-service/src/test/java/com/linkerbot/cadworld/service/impl/ComponentUploadSupportTest.java +++ b/cadworld-service/src/test/java/com/linkerbot/cadworld/service/impl/ComponentUploadSupportTest.java @@ -15,13 +15,14 @@ class ComponentUploadSupportTest { final StorageProperties properties = new StorageProperties("cadworld_dev","http://localhost", Duration.ofMinutes(30),Duration.ofMinutes(5),8); final ObjectStorageClient storage = mock(ObjectStorageClient.class); - final ComponentUploadSupport support = new ComponentUploadSupport(properties,storage, + final ComponentUploadSupport support = new ComponentUploadSupport(properties,storage,new StorageObjectKeys(properties)); + final ComponentUploadSessionSupport sessions = new ComponentUploadSessionSupport(properties, new ComponentUploadSessionTokenProvider(new UploadSessionProperties("upload","test-upload-signing-key-32-bytes-long")), new StorageObjectKeys(properties)); final String code = "CW-"+"A".repeat(32), batch = "a".repeat(32); final ComponentUploadSessionTokenProvider.UploadSessionClaims session = new ComponentUploadSessionTokenProvider.UploadSessionClaims(0L,null,code,batch, - support.prefix(code,batch,"step"),support.prefix(code,batch,"urdf"),Instant.now().plusSeconds(60)); + sessions.prefix(code,batch,"step"),sessions.prefix(code,batch,"urdf"),Instant.now().plusSeconds(60)); @Test void validatesEntireManifestBeforeAccessingStorageAndRejectsUnknownSize() {