feat(WS-D): 查看页附件只读下载列表 + 用户引用列(发布人)显示名
D.2 附件查看下载列表(对齐老系统):
- 附件按 sys_doc.tablename+businesskey 关联业务记录(非物理列),老
MultiFileUploadField→input-file 在只读查看态渲染空上传按钮、不显已有附件。
- FileController 新增 GET /api/file/list(按 tableName+businessKey 列 sys_doc),
返回 {status,data:{items:[{id,name,size,sizeKb,url}]}};空业务键不查库防全表扫。
- 转换器 enrichAttachmentFields:把附件字段(input-file)就地包成 service 容器——
api 按业务主键 ${<TABLE>_ID} 拉 /api/file/list,each 渲染已有附件下载链接
(文件名(大小KB)+/api/file/${id}),并保留上传控件(编辑态加附件)。
service 纳入 isWideField(独占整行)。convertViewPage/convertForm 均接入。
D.3 用户引用列(发布人)显示名:
- 根因:查看新闻列表走命名读流 OA_NEWSMANAGE_SEARCH_LOOK,FlowController
NAMED_READ 分支此前 table=null 跳过 UserColumnResolver→USERSEND_ID_DISPLAY__
不填→发布人显「-」。USERSEND_ID 本就是 SYS_USER 引用,解析器口径无误。
- FlowNameResolver 新增 entityTableForNamedFlow(经 sys_serviceflow.entityid→
sys_entity.tablename 解析命名读流数据源实体表,缓存+失败哨兵);FlowController
NAMED_READ 分支据此传 table 给 ok(...),解析器补出 _DISPLAY__ 显示名。
测试:
- TemplateToAmisConverterTest 92 绿(改 3 既有附件断言+新增查看态下载列表断言)。
- FlowControllerTest 29 绿(#16 改命名读流解析不到表跳过,#16b 新增命名读流
解析出表→发布人 id→姓名)。FileControllerTest 4 绿(list/空键/空集/小文件KB)。
实证(8093 live + 5173 playwright):查看新闻列表发布人显 顾竟蓝[000031]/
李文娟[000010]/沈波恩[000008](非「-」);查看含附件新闻→附件下载列表显
文件名+KB+下载链(3 项),真实文件下载 200+attachment;console 0 错。
全量重转(保 onEvent 501)+SchemaImportCli upsert 1163,JDK21。
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Binary file not shown.
@@ -207,8 +207,78 @@ public class FileController {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 按业务实体(tableName + businessKey)列出已有附件(WS-D D.2)。
|
||||
*
|
||||
* <p>查看(只读)态新闻/通知等查看页的附件字段(DOCUMENT,老 MultiFileUploadField)数据源:
|
||||
* 附件按 {@code sys_doc.tablename + businesskey} 关联业务记录(非物理列),查看态须列出已有附件供下载,
|
||||
* 而非空上传按钮。amis {@code service} 组件按本端点拉取,{@code each} 渲染「文件名 (大小KB) + 下载」列表。
|
||||
*
|
||||
* @param tableName 业务表名(大小写不敏感,入库前已大写存储)
|
||||
* @param businessKey 业务记录主键(空 → 返回空列表,防全表扫)
|
||||
* @return amis 约定 {@code {status:0, data:{items:[{id,name,size,sizeKb,url}]}}}
|
||||
*/
|
||||
@Operation(summary = "按业务 id 列已有附件",
|
||||
description = "按 sys_doc.tablename+businesskey 列附件,供查看态只读下载列表;返回 {status,data:{items}}")
|
||||
@GetMapping("/list")
|
||||
public ResponseEntity<Map<String, Object>> list(
|
||||
@RequestParam("tableName") String tableName,
|
||||
@RequestParam("businessKey") String businessKey) {
|
||||
|
||||
List<Map<String, Object>> items = new java.util.ArrayList<>();
|
||||
// 业务键缺失 → 空列表(不查库,防 businesskey 为空时全表附件扫出)
|
||||
if (tableName != null && !tableName.isBlank() && businessKey != null && !businessKey.isBlank()) {
|
||||
List<Map<String, Object>> rows = jdbcTemplate.queryForList(
|
||||
"SELECT sys_doc_id, filename, filesize FROM sys_doc "
|
||||
+ "WHERE UPPER(tablename) = ? AND TRIM(businesskey) = ? AND isactive = 1 "
|
||||
+ "ORDER BY createtime",
|
||||
tableName.trim().toUpperCase(), businessKey.trim());
|
||||
for (Map<String, Object> r : rows) {
|
||||
String docId = String.valueOf(r.get("sys_doc_id")).trim();
|
||||
long size = toLong(r.get("filesize"));
|
||||
Map<String, Object> item = new LinkedHashMap<>();
|
||||
item.put("id", docId);
|
||||
item.put("name", r.get("filename"));
|
||||
item.put("size", size);
|
||||
item.put("sizeKb", sizeToKb(size));
|
||||
item.put("url", "/api/file/" + docId);
|
||||
items.add(item);
|
||||
}
|
||||
}
|
||||
|
||||
Map<String, Object> data = new LinkedHashMap<>();
|
||||
data.put("items", items);
|
||||
Map<String, Object> resp = new LinkedHashMap<>();
|
||||
resp.put("status", 0);
|
||||
resp.put("msg", "");
|
||||
resp.put("data", data);
|
||||
return ResponseEntity.ok(resp);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 内部工具
|
||||
|
||||
/** 字节 → KB(向上取整,非空文件至少显 1KB,避免「0KB」误导)。 */
|
||||
private static long sizeToKb(long bytes) {
|
||||
if (bytes <= 0) {
|
||||
return 0;
|
||||
}
|
||||
return Math.max(1, (bytes + 1023) / 1024);
|
||||
}
|
||||
|
||||
private static long toLong(Object v) {
|
||||
if (v instanceof Number n) {
|
||||
return n.longValue();
|
||||
}
|
||||
if (v == null) {
|
||||
return 0;
|
||||
}
|
||||
try {
|
||||
return Long.parseLong(String.valueOf(v).trim());
|
||||
} catch (NumberFormatException e) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
private static String extractExt(String filename) {
|
||||
if (filename == null || !filename.contains(".")) {
|
||||
return "";
|
||||
|
||||
@@ -271,10 +271,12 @@ public class FlowController {
|
||||
yield ok(output, null);
|
||||
}
|
||||
case NAMED_READ -> {
|
||||
// 命名读流:GET/POST 皆可。非合成路径无法稳妥推断实体表,故不做用户列解析(table=null)。
|
||||
// 命名读流:GET/POST 皆可。WS-D D.3:命名读流(如查看新闻查询 OA_NEWSMANAGE_SEARCH_LOOK)按其
|
||||
// sys_serviceflow.entityid → sys_entity.tablename 解析数据源实体表,使引用列 id→姓名解析生效
|
||||
// (发布人 USERSEND_ID 等显「-」根因);解析不到 → null,跳过解析(现状行为不变)。
|
||||
Properties ctx = UserSession.getAdmin();
|
||||
Object output = flowExcuteService.excute(map, ctx, id);
|
||||
yield ok(output, null);
|
||||
yield ok(output, flowNameResolver.entityTableForNamedFlow(id));
|
||||
}
|
||||
case NAMED_WRITE -> {
|
||||
// 命名写流:GET 拒绝(防 URL 触发写);POST 用真实 JWT 用户上下文执行
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
package com.eip4.platform.metadata.web;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.jdbc.core.JdbcOperations;
|
||||
|
||||
/**
|
||||
* WS-D D.2 FileController.list(按业务 id 列已有附件)单测(mock JdbcTemplate,不连库)。
|
||||
*
|
||||
* <p>覆盖:按 tableName+businessKey 列附件 → amis 约定 {status:0, data:{items:[{id,name,size,sizeKb,url}]}};
|
||||
* 空业务键参数防御;KB 折算;空列表返回。下载列表是查看页只读附件下载列表的数据源(DOCUMENT 字段)。
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
class FileControllerTest {
|
||||
|
||||
private JdbcOperations jdbc;
|
||||
private FileController controller;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
jdbc = mock(JdbcOperations.class);
|
||||
controller = new FileController(jdbc, "./data/files");
|
||||
}
|
||||
|
||||
private Map<String, Object> docRow(String id, String name, long size) {
|
||||
Map<String, Object> m = new LinkedHashMap<>();
|
||||
m.put("sys_doc_id", id);
|
||||
m.put("filename", name);
|
||||
m.put("filesize", size);
|
||||
return m;
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("1. 按 tableName+businessKey 列附件 → status=0, items 含 id/name/size/sizeKb/url")
|
||||
void listByBusinessKey() {
|
||||
List<Map<String, Object>> rows = List.of(
|
||||
docRow("doc-1", "奖杯.JPG", 6857687L),
|
||||
docRow("doc-2", "苏州五建.zip", 11985224L));
|
||||
// tableName 入库前大写,businessKey 原样
|
||||
when(jdbc.queryForList(anyString(), eq("OA_NEWSMANAGE"), eq("biz-123"))).thenReturn(rows);
|
||||
|
||||
ResponseEntity<Map<String, Object>> resp = controller.list("oa_newsmanage", "biz-123");
|
||||
|
||||
Map<String, Object> body = resp.getBody();
|
||||
assertNotNull(body);
|
||||
assertEquals(0, body.get("status"));
|
||||
Map<String, Object> data = (Map<String, Object>) body.get("data");
|
||||
List<Map<String, Object>> items = (List<Map<String, Object>>) data.get("items");
|
||||
assertEquals(2, items.size());
|
||||
|
||||
Map<String, Object> first = items.get(0);
|
||||
assertEquals("doc-1", first.get("id"));
|
||||
assertEquals("奖杯.JPG", first.get("name"));
|
||||
assertEquals(6857687L, first.get("size"));
|
||||
// 6857687 / 1024 = 6697 KB(向上取整,至少 1KB)
|
||||
assertEquals(6697L, first.get("sizeKb"));
|
||||
assertEquals("/api/file/doc-1", first.get("url"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("2. 空 businessKey → status=0, items 空(不查库,防全表扫)")
|
||||
void listBlankBusinessKey() {
|
||||
ResponseEntity<Map<String, Object>> resp = controller.list("OA_NEWSMANAGE", " ");
|
||||
Map<String, Object> body = resp.getBody();
|
||||
assertNotNull(body);
|
||||
assertEquals(0, body.get("status"));
|
||||
Map<String, Object> data = (Map<String, Object>) body.get("data");
|
||||
assertTrue(((List<?>) data.get("items")).isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("3. 无匹配附件 → status=0, items 空列表(不报错)")
|
||||
void listEmpty() {
|
||||
when(jdbc.queryForList(anyString(), eq("OA_NEWSMANAGE"), eq("biz-none"))).thenReturn(List.of());
|
||||
ResponseEntity<Map<String, Object>> resp = controller.list("OA_NEWSMANAGE", "biz-none");
|
||||
Map<String, Object> data = (Map<String, Object>) resp.getBody().get("data");
|
||||
assertTrue(((List<?>) data.get("items")).isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("4. 小文件 (<1KB) → sizeKb 至少 1(不显 0KB)")
|
||||
void listSmallFileSizeKbAtLeastOne() {
|
||||
when(jdbc.queryForList(anyString(), eq("OA_NEWSMANAGE"), eq("biz-1")))
|
||||
.thenReturn(List.of(docRow("doc-s", "tiny.txt", 200L)));
|
||||
ResponseEntity<Map<String, Object>> resp = controller.list("OA_NEWSMANAGE", "biz-1");
|
||||
Map<String, Object> data = (Map<String, Object>) resp.getBody().get("data");
|
||||
List<Map<String, Object>> items = (List<Map<String, Object>>) data.get("items");
|
||||
assertEquals(1L, items.get(0).get("sizeKb"));
|
||||
}
|
||||
}
|
||||
@@ -418,13 +418,16 @@ class FlowControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("16. UUID/命名路径: 不调用用户列解析器(无法稳妥推断实体表,table=null)")
|
||||
@DisplayName("16. UUID/命名路径: 实体表解析不到(entityTableForNamedFlow=null)→ 不调用用户列解析器")
|
||||
void nonSynthesizedDoesNotInvokeResolver() {
|
||||
String flowId = "COMMON_REPORT";
|
||||
FlowExcuteService engine = mock(FlowExcuteService.class);
|
||||
when(engine.excute(any(), any(), any())).thenReturn(new HashMap<>());
|
||||
UserColumnResolver userResolver = mock(UserColumnResolver.class);
|
||||
FlowController controller = new FlowController(engine, resolverReturning(flowId, namedHit()), userResolver);
|
||||
FlowNameResolver resolver = resolverReturning(flowId, namedHit());
|
||||
// 命名读流解析不到实体表(报表类无 entityid)→ null → 跳过解析(现状行为不变)
|
||||
when(resolver.entityTableForNamedFlow(flowId)).thenReturn(null);
|
||||
FlowController controller = new FlowController(engine, resolver, userResolver);
|
||||
|
||||
controller.executeGet(flowId, new HashMap<>());
|
||||
|
||||
@@ -432,6 +435,56 @@ class FlowControllerTest {
|
||||
.resolveRows(org.mockito.ArgumentMatchers.anyString(), any(List.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("16b. 命名读流(查看新闻查询)可解析实体表 → 用户引用列解析器以该表 + items 行被调用(发布人显「-」修复,WS-D D.3)")
|
||||
@SuppressWarnings("unchecked")
|
||||
void namedReadWithResolvableTableInvokesUserColumnResolver() {
|
||||
String flowId = "OA_NEWSMANAGE_SEARCH_LOOK"; // 命名读流「查看新闻查询」
|
||||
|
||||
// 引擎返回搜索流默认输出形态 {result:{listresult:[POJO], pagecount:1}}
|
||||
Map<String, Object> listResult = new LinkedHashMap<>();
|
||||
Map<String, Object> cols = new LinkedHashMap<>();
|
||||
cols.put("USERSEND_ID", "user-42");
|
||||
cols.put("TITLE", "公司新闻");
|
||||
List<GeneralPOJO> pojos = new ArrayList<>();
|
||||
pojos.add(fakeRow("row-1", cols));
|
||||
listResult.put(POJOCRUDService.LIST_RESULT, pojos);
|
||||
listResult.put(POJOCRUDService.PAGE_COUNT, 1);
|
||||
Map<String, Object> output = new LinkedHashMap<>();
|
||||
output.put("result", listResult);
|
||||
|
||||
FlowExcuteService engine = mock(FlowExcuteService.class);
|
||||
when(engine.excute(any(), any(), eq(flowId))).thenReturn(output);
|
||||
|
||||
// 命名读流经 sys_serviceflow.entityid → sys_entity.tablename 解析到 OA_NEWSMANAGE
|
||||
FlowNameResolver resolver = resolverReturning(flowId, namedHit());
|
||||
when(resolver.entityTableForNamedFlow(flowId)).thenReturn("OA_NEWSMANAGE");
|
||||
|
||||
// 解析器桩:把 USERSEND_ID 补出 _DISPLAY__ 平行字段(验证就地改写反映到响应)
|
||||
UserColumnResolver userResolver = mock(UserColumnResolver.class);
|
||||
org.mockito.Mockito.doAnswer(inv -> {
|
||||
List<Map<String, Object>> rows = inv.getArgument(1);
|
||||
for (Map<String, Object> r : rows) {
|
||||
if ("user-42".equals(r.get("USERSEND_ID"))) {
|
||||
r.put("USERSEND_ID_DISPLAY__", "罗来伟[130218]");
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}).when(userResolver).resolveRows(eq("OA_NEWSMANAGE"), any(List.class));
|
||||
|
||||
FlowController controller = new FlowController(engine, resolver, userResolver);
|
||||
|
||||
ResponseEntity<Map<String, Object>> resp = controller.executeGet(flowId, new HashMap<>());
|
||||
|
||||
// 解析器被以「命名读流解析出的实体表」调用
|
||||
org.mockito.Mockito.verify(userResolver).resolveRows(eq("OA_NEWSMANAGE"), any(List.class));
|
||||
// 发布人显示名补出,原始 id 保留
|
||||
Map<String, Object> data = (Map<String, Object>) resp.getBody().get("data");
|
||||
List<Map<String, Object>> items = (List<Map<String, Object>>) data.get("items");
|
||||
assertEquals("罗来伟[130218]", items.get(0).get("USERSEND_ID_DISPLAY__"), "发布人引用列 id → 姓名(显示列)");
|
||||
assertEquals("user-42", items.get(0).get("USERSEND_ID"), "原始 id 列保留不动");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("14. 无分页参数: 不注入分页键(命名/报表流无分页语义时不凭空加键)")
|
||||
void noPagingKeysWhenAbsent() {
|
||||
|
||||
Reference in New Issue
Block a user