优化:名录编码自动生成并隐藏维护入口

This commit is contained in:
2026-11-03 13:11:00 +08:00
parent 52d92c95d8
commit 1aeccddd4d
8 changed files with 126 additions and 36 deletions
@@ -184,11 +184,15 @@ public class MasterDataWorkbookService {
line++; String code = text(source, columns, "code"), name = text(source, columns, "name");
if (code.isBlank() && !name.isBlank()) {
code = codesByName.getOrDefault(name, "REF-" + UUID.nameUUIDFromBytes((kind + ":" + name).getBytes(java.nio.charset.StandardCharsets.UTF_8)));
if (existing.containsKey(code) && !name.equals(existing.get(code).get("name"))) throw bad("第" + line + "行自动编码与已有记录冲突,请指定编码列");
while ((existing.containsKey(code) && !name.equals(existing.get(code).get("name")))
|| imported.containsKey(code) && !name.equals(imported.get(code).get("name")))
code = "REF-" + UUID.randomUUID();
}
if (code.isBlank() || name.isBlank() || code.length() > 100 || name.length() > 190) throw bad("第" + line + "行编码或名称为空/过长");
if (imported.containsKey(code) || !names.add(name)) throw bad("第" + line + "行编码或名称重复,未写入草稿");
imported.put(code, new LinkedHashMap<>(Map.of("code", code, "name", name, "enabled", enabled(text(source, columns, "enabled"), line))));
Map<String, Object> item = new LinkedHashMap<>(existing.getOrDefault(code, Map.of()));
item.putAll(Map.of("code", code, "name", name, "enabled", enabled(text(source, columns, "enabled"), line)));
imported.put(code, item);
}
int added = 0, updated = 0, disabled = 0;
for (var row : imported.entrySet()) { if (existing.containsKey(row.getKey())) updated++; else added++; }
@@ -42,6 +42,20 @@ class MasterDataWorkbookServiceTest {
assertEquals(0,again.get("added"));
assertEquals(generated,((Map<?,?>)((List<?>)((Map<?,?>)definition.get("masterData")).get("products")).get(1)).get("code"));
}
@Test void automaticCodeCollisionIsResolvedAndExistingOwnershipIsPreserved() {
String reserved = "REF-" + java.util.UUID.nameUUIDFromBytes("groups:新分组".getBytes(java.nio.charset.StandardCharsets.UTF_8));
Map<String,Object> definition = new LinkedHashMap<>(Map.of("masterData", Map.of("groups", List.of(
Map.of("code",reserved,"name","已有分组","enabled",true,"department","原产业部","extra","keep")))));
var input = List.of(Map.of("名称","已有分组"),Map.of("名称","新分组"));
MasterDataWorkbookService.importMaster(definition,input,"groups","MERGE",Map.of("name","名称"));
var rows=(List<?>)((Map<?,?>)definition.get("masterData")).get("groups");
var original=(Map<?,?>)rows.getFirst();var added=(Map<?,?>)rows.get(1);
assertEquals(reserved,original.get("code"));assertEquals("原产业部",original.get("department"));assertEquals("keep",original.get("extra"));
assertNotEquals(reserved,added.get("code"));
MasterDataWorkbookService.importMaster(definition,input,"groups","MERGE",Map.of("name","名称"));
assertEquals(2,((List<?>)((Map<?,?>)definition.get("masterData")).get("groups")).size());
}
@Test void replaceReferenceTableRetainsOmittedNamesAsDisabledAndPreservesOtherKinds() {
Map<String,Object> definition = new LinkedHashMap<>(Map.of("masterData",Map.of("products",List.of(Map.of("code","OLD","name","旧产品","enabled",true)),"departments",List.of(Map.of("code","D","name","产业部","enabled",true)))));
var result=MasterDataWorkbookService.importMaster(definition,List.of(Map.of("编码","NEW","名称","新产品")),"products","REPLACE",Map.of("code","编码","name","名称"));