From e876327c7517c553e82f03fe960cdf5f307bdd05 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Fri, 12 Jun 2026 00:47:31 +0800 Subject: [PATCH] =?UTF-8?q?F2-8:=20=E5=86=99=E9=93=BE=E8=B7=AF=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=8F=8B=E5=A5=BD=E5=93=8D=E5=BA=94=20+=20=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E6=8E=A7=E4=BB=B6=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 WriteExceptionHandler:ValidationException→422、PrivilegeException→403、 RuntimeException→500,均返回 amis 约定 {status,msg},不再裸透 Spring 500 - UiTypeMapper 新增 MultiFileUploadField/FileUploadField → input-file (receiver=/api/file/upload, downloadUrl=/api/file/${id}, multiple) - 转换器单测新增 form_附件字段MultiFileUploadField转inputFile(28/28 pass) Co-Authored-By: Claude Fable 5 --- .../eip4/platform/converter/UiTypeMapper.java | 17 ++++ .../TemplateToAmisConverterTest.java | 35 ++++++++ .../metadata/web/WriteExceptionHandler.java | 83 +++++++++++++++++++ 3 files changed, 135 insertions(+) create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/web/WriteExceptionHandler.java diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java b/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java index b57660c..bff6f68 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java @@ -132,6 +132,23 @@ final class UiTypeMapper { result.degrade(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid=" + f.attributeValue("dialogid", "") + ") → select(multiple)+source 占位(数据源待实现)"); } + case "MultiFileUploadField", "FileUploadField" -> { + // F2-8 附件控件:旧引擎 MultiFileUploadField/FileUploadField → amis input-file。 + // receiver=/api/file/upload(amis multipart 默认字段名 file), + // 下载链 /api/file/${id}(FileController.download)。 + // downloadUrl 让 amis 在已上传列表显示可点击下载链。 + boolean multi = "MultiFileUploadField".equals(uitype); + item.put("type", "input-file"); + item.put("receiver", "/api/file/upload"); + item.put("downloadUrl", "/api/file/${id}"); + if (multi) { + item.put("multiple", true); + } + // amis input-file 默认 accept 全部类型;maxSize 暂不限制 + result.note(origin + "@field " + name + " uitype=" + uitype + + " → input-file(receiver=/api/file/upload, downloadUrl=/api/file/${id}" + + (multi ? ", multiple" : "") + ")"); + } default -> { item.put("type", "input-text"); result.degrade(origin + "@field " + name + " uitype=" + uitype diff --git a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java index 1edf6b5..1812e8f 100644 --- a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java +++ b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java @@ -188,6 +188,41 @@ class TemplateToAmisConverterTest { assertTrue(r.getDegrades().stream().anyMatch(d -> d.contains("view_page"))); } + @Test + @SuppressWarnings("unchecked") + void form_附件字段MultiFileUploadField转inputFile() { + // F2-8 实证:MultiFileUploadField / FileUploadField → input-file(receiver + downloadUrl) + String pageXml = "" + + "" + + "" + + "" + + ""; + Function resolver = id -> pageXml; + String xml = "
"; + List notes = new ArrayList<>(); + ConversionResult r = converter.convertGraded(xml, "附件测试表单", notes, resolver); + + Map form = body(r.getSchema()); + List> items = (List>) form.get("body"); + assertEquals(3, items.size()); + + // MultiFileUploadField → input-file, multiple=true + Map docField = items.get(1); + assertEquals("input-file", docField.get("type")); + assertEquals("/api/file/upload", docField.get("receiver")); + assertEquals("/api/file/${id}", docField.get("downloadUrl")); + assertEquals(true, docField.get("multiple")); + + // FileUploadField → input-file, no multiple + Map singleField = items.get(2); + assertEquals("input-file", singleField.get("type")); + assertEquals("/api/file/upload", singleField.get("receiver")); + assertNull(singleField.get("multiple")); + + // 映射台账中有 input-file 记录 + assertTrue(notes.stream().anyMatch(n -> n.contains("input-file"))); + } + // ── tree ───────────────────────────────────────────────────────────── @Test diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/WriteExceptionHandler.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/WriteExceptionHandler.java new file mode 100644 index 0000000..45176c4 --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/WriteExceptionHandler.java @@ -0,0 +1,83 @@ +package com.eip4.platform.metadata.web; + +import java.util.LinkedHashMap; +import java.util.Map; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import com.dsasp.server.common.exception.PrivilegeException; +import com.dsasp.server.common.exception.ValidationException; + +/** + * F2-8 写链路异常 → amis 友好响应。 + * + *

拦截 EntityWriteController / FileController 抛出的业务异常, + * 转换成 amis 约定格式,避免 Spring 默认 500 裸 JSON 透传前端。 + * + *

    + *
  • {@link ValidationException} — 业务校验失败(必填/重复/约束等)→ + * HTTP 422 + {@code {status:422, msg}} (amis form 默认对 status≠0 显示顶部错误提示)
  • + *
  • {@link PrivilegeException} — 数据权限拒绝 → + * HTTP 403 + {@code {status:403, msg}}
  • + *
+ * + *

纪律:零改 {@code com.dsasp};不依赖 Spring Validation(引擎校验经 ValidationException 抛出)。 + */ +@RestControllerAdvice(assignableTypes = {EntityWriteController.class, FileController.class}) +public class WriteExceptionHandler { + + /** + * 业务校验失败(引擎 ValidationException)→ HTTP 422 amis 格式。 + * + *

amis form 约定:{@code status≠0} 时显示顶部错误提示({@code msg} 字段); + * 若需字段级行内错误则需 {@code status:422, errors:{fieldName:msg}}, + * 但引擎 ValidationException 消息不含字段名(如"分类是必填项"), + * 故只返回 msg,amis form 会在顶部 toast/alert 区显示。 + */ + @ExceptionHandler(ValidationException.class) + public ResponseEntity> handleValidation(ValidationException ex) { + Map body = new LinkedHashMap<>(); + body.put("status", 422); + body.put("msg", ex.getMessage() != null ? ex.getMessage() : "数据校验失败,请检查输入"); + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(body); + } + + /** + * 数据权限拒绝(写侧 PrivilegeException)→ HTTP 403 amis 格式。 + * + *

amis form 收到 403 时默认显示 msg 文案;前端不再裸显 Spring 默认 403 JSON。 + */ + @ExceptionHandler(PrivilegeException.class) + public ResponseEntity> handlePrivilege(PrivilegeException ex) { + Map body = new LinkedHashMap<>(); + body.put("status", 403); + body.put("msg", ex.getMessage() != null ? ex.getMessage() : "无操作权限"); + return ResponseEntity.status(HttpStatus.FORBIDDEN).body(body); + } + + /** + * 兜底:其他 RuntimeException(引擎 SQL/状态机异常等)→ HTTP 500 amis 格式。 + * + *

把裸 Spring 500 JSON 替换为 amis 约定体,前端 amis form 可显示 msg 而非空白。 + * 注意仅对 EntityWriteController / FileController 生效(assignableTypes 限定), + * 不干扰其他 Controller 的异常处理链。 + */ + @ExceptionHandler(RuntimeException.class) + public ResponseEntity> handleRuntime(RuntimeException ex) { + Map body = new LinkedHashMap<>(); + body.put("status", 1); + // 暴露简短消息(不含堆栈);内部引擎消息通常已是中文业务描述 + String msg = ex.getMessage(); + if (msg == null || msg.isBlank()) { + msg = "服务器内部错误,请稍后重试"; + } else if (msg.length() > 200) { + // 截断过长的技术消息,防止泄露内部细节 + msg = msg.substring(0, 200) + "…"; + } + body.put("msg", msg); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(body); + } +}