- flw_def 唯一键 (sch,code,ver)→(sch,flow_guid,ver)(uk_flw_def_guid_ver,生产/本地已手工切索引):升版本 maxByGuid+1 与唯一键同口径,同编码多条流程线(work-leave 三条线实锤追尾)不再死锁 - 新建永远新开流程线 v1,删除同编码草稿复用;撞唯一键转"保存冲突"友好提示 - 新增 flw_def.app_key 归属应用列:save 全链路透传(升版本缺省继承源线、传非空覆盖);/admin/def/list 支持 appKey 过滤;新增 /admin/def/appkeys 应用清单(flw_def 已标注 ∪ 已注册回调) - FlowDefAdminServiceSaveTest 10 用例锁 save 分派语义
This commit is contained in:
@@ -54,8 +54,15 @@ public class FlowAdminController {
|
||||
|
||||
@GetMapping("/def/list")
|
||||
public List<FlwDef> defList(BoaUser user,
|
||||
@RequestParam(value = "status", required = false) Integer status) {
|
||||
return defAdminService.list(adminGuard.requireAdmin(user, null), status);
|
||||
@RequestParam(value = "status", required = false) Integer status,
|
||||
@RequestParam(value = "appKey", required = false) String appKey) {
|
||||
return defAdminService.list(adminGuard.requireAdmin(user, null), status, appKey);
|
||||
}
|
||||
|
||||
/** 应用清单("按应用筛选"下拉):本校 flw_def 已标注 ∪ 已注册回调的应用 */
|
||||
@GetMapping("/def/appkeys")
|
||||
public List<String> defAppKeys(BoaUser user) {
|
||||
return defAdminService.distinctAppKeys(adminGuard.requireAdmin(user, null));
|
||||
}
|
||||
|
||||
@GetMapping("/def/get")
|
||||
@@ -70,7 +77,8 @@ public class FlowAdminController {
|
||||
Long id = body.get("id") == null ? null : Long.valueOf(String.valueOf(body.get("id")));
|
||||
return defAdminService.save(schId, id,
|
||||
(String) body.get("code"), (String) body.get("name"),
|
||||
(String) body.get("contentJson"), (String) body.get("baseGuid"));
|
||||
(String) body.get("contentJson"), (String) body.get("baseGuid"),
|
||||
(String) body.get("appKey"));
|
||||
}
|
||||
|
||||
@PostMapping("/def/publish/{id}")
|
||||
|
||||
Reference in New Issue
Block a user