feat: add framework script editor actions
Some checks failed
ci / build-test-parity (push) Has been cancelled
Some checks failed
ci / build-test-parity (push) Has been cancelled
This commit is contained in:
@@ -95,13 +95,33 @@ public final class EngineclassDelta {
|
||||
EngineclassDelta::processFormRemoveCrudAnchor);
|
||||
|
||||
// 流程监控:ProcessMonitorComponentNew 原有「处理 / 高级处理 / 结束流程」。
|
||||
// EIP4 当前只注入真实可用的「处理」明细查看与「结束流程」;高级处理(Groovy)需权限/审计另案。
|
||||
// 高级处理接网关 Groovy 执行端点,按旧系统绑定 processid/businessKey。
|
||||
register("com.dsasp.client.wf.ui.process.monitor.ProcessMonitorComponentNew",
|
||||
EngineclassDelta::processMonitorDetailButton,
|
||||
EngineclassDelta::processMonitorAdvancedScriptButton,
|
||||
EngineclassDelta::processMonitorTerminateButton);
|
||||
registerMutator("com.dsasp.client.wf.ui.process.monitor.ProcessMonitorComponentNew",
|
||||
EngineclassDelta::processMonitorCrudAnchor);
|
||||
|
||||
// 定义定时任务:ScheduleJobDesignComponent 在 treegrid 右侧列表增加「编辑任务脚本」。
|
||||
register("com.dsasp.client.tools.schedulejob.ScheduleJobDesignComponent",
|
||||
EngineclassDelta::scheduleJobScriptButton);
|
||||
|
||||
// 数据导入配置管理:DataImportConfigView 加「编辑转换脚本 / 编辑保存脚本」。
|
||||
register("com.dsasp.client.dataimport.view.DataImportConfigView",
|
||||
EngineclassDelta::dataImportConvertScriptButton,
|
||||
EngineclassDelta::dataImportSaveScriptButton);
|
||||
|
||||
// 功能/视图管理与自定义列表:先补高级配置 XML 源码编辑入口;可视化设计器另走独立路由。
|
||||
register("com.dsasp.client.viewframework.component.UserFunDesignComponent",
|
||||
EngineclassDelta::viewTemplateXmlButton);
|
||||
register("com.dsasp.client.viewframework.component.UserPageDesignComponent",
|
||||
EngineclassDelta::viewPageXmlButton);
|
||||
register("com.dsasp.client.viewframework.component.UserFunDesignCustomComponent",
|
||||
EngineclassDelta::viewTemplateCustomXmlButton);
|
||||
register("com.dsasp.client.viewframework.component.UserPageDesignCustomComponent",
|
||||
EngineclassDelta::viewPageCustomXmlButton);
|
||||
|
||||
// 消息查看:MessageReceiveView/MessageSendView 在默认 GridTemplateComponent 之上加「查看」按钮。
|
||||
// 收到消息按 SYS_MESSAGEUSER_ID 打开并置已读;已发送消息按 SYS_MESSAGE_ID 打开只读详情。
|
||||
register("com.dsasp.client.tools.message.MessageReceiveView",
|
||||
@@ -147,14 +167,10 @@ public final class EngineclassDelta {
|
||||
if (builders == null || builders.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
Object bodyObj = schema.get("body");
|
||||
if (!(bodyObj instanceof Map)) {
|
||||
Map<String, Object> body = firstCrud(schema);
|
||||
if (body == null) {
|
||||
return;
|
||||
}
|
||||
Map<String, Object> body = (Map<String, Object>) bodyObj;
|
||||
if (!"crud".equals(body.get("type"))) {
|
||||
return; // 仅 crud 列表页注入工具栏按钮(tree/group/page 等暂不在此机制)
|
||||
}
|
||||
Object tbObj = body.get("headerToolbar");
|
||||
if (!(tbObj instanceof List)) {
|
||||
return;
|
||||
@@ -174,6 +190,39 @@ public final class EngineclassDelta {
|
||||
}
|
||||
}
|
||||
|
||||
/** 优先取顶层 body crud;非顶层页面(treegrid/grid)递归找第一个 crud。 */
|
||||
@SuppressWarnings("unchecked")
|
||||
private static Map<String, Object> firstCrud(Map<String, Object> schema) {
|
||||
Object bodyObj = schema.get("body");
|
||||
if (bodyObj instanceof Map<?, ?> body && "crud".equals(body.get("type"))) {
|
||||
return (Map<String, Object>) bodyObj;
|
||||
}
|
||||
return findFirstCrud(schema);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static Map<String, Object> findFirstCrud(Object node) {
|
||||
if (node instanceof Map<?, ?> map) {
|
||||
if ("crud".equals(map.get("type"))) {
|
||||
return (Map<String, Object>) node;
|
||||
}
|
||||
for (Object value : map.values()) {
|
||||
Map<String, Object> found = findFirstCrud(value);
|
||||
if (found != null) {
|
||||
return found;
|
||||
}
|
||||
}
|
||||
} else if (node instanceof List<?> list) {
|
||||
for (Object value : list) {
|
||||
Map<String, Object> found = findFirstCrud(value);
|
||||
if (found != null) {
|
||||
return found;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/** ② 整页改写器:对注册的 mutator 逐个施加到整页 schema(任意 body 类型);未注册 → no-op。 */
|
||||
private static void applyMutators(Map<String, Object> schema, String engineclass, ConversionResult result) {
|
||||
List<BiConsumer<Map<String, Object>, ConversionResult>> mutators = MUTATORS.get(engineclass);
|
||||
@@ -446,6 +495,36 @@ public final class EngineclassDelta {
|
||||
return btn;
|
||||
}
|
||||
|
||||
/** 流程监控「高级处理」:打开标准代码编辑弹窗,提交 Groovy 到网关执行。 */
|
||||
private static Map<String, Object> processMonitorAdvancedScriptButton(String pkField) {
|
||||
Map<String, Object> form = mapOf(
|
||||
"type", "form",
|
||||
"id", "process-monitor-advanced-script-form",
|
||||
"wrapWithPanel", false,
|
||||
"api", mapOf(
|
||||
"method", "post",
|
||||
"url", "/api/workflow/process/" + selectedSingleFieldExpr(pkField) + "/advanced-script",
|
||||
"data", mapOf(
|
||||
"script", "${script}",
|
||||
"businessKey", "${selectedItems[0].businessKey || selectedItems[0].BUSINESSKEY || ''}",
|
||||
"tableName", "${selectedItems[0].businessTable || selectedItems[0].BUSINESSTABLE || ''}")),
|
||||
"body", List.of(codeEditor("script", "高级处理脚本", "java", "")));
|
||||
Map<String, Object> btn = new LinkedHashMap<>();
|
||||
btn.put("type", "button");
|
||||
btn.put("id", "高级处理");
|
||||
btn.put("label", "高级处理");
|
||||
btn.put("icon", "fa fa-code");
|
||||
btn.put("disabledOn", "${!selectedItems || selectedItems.length !== 1}");
|
||||
btn.put("actionType", "dialog");
|
||||
btn.put("dialog", mapOf(
|
||||
"type", "dialog",
|
||||
"title", "高级处理",
|
||||
"size", "xl",
|
||||
"body", form,
|
||||
"actions", formActions()));
|
||||
return btn;
|
||||
}
|
||||
|
||||
/** 流程监控「结束流程」:按流程实例作废活动流程。 */
|
||||
private static Map<String, Object> processMonitorTerminateButton(String pkField) {
|
||||
Map<String, Object> btn = new LinkedHashMap<>();
|
||||
@@ -480,6 +559,103 @@ public final class EngineclassDelta {
|
||||
}
|
||||
}
|
||||
|
||||
// ── 通用脚本/XML 编辑器按钮 ────────────────────────────────────────────
|
||||
|
||||
private static Map<String, Object> scheduleJobScriptButton(String pkField) {
|
||||
return fieldEditorButton("编辑任务脚本", "fa fa-code",
|
||||
"SYS_SCHEDULEJOB", "SYS_SCHEDULEJOB_ID", pkField, "RUNSCRIPT", "java");
|
||||
}
|
||||
|
||||
private static Map<String, Object> dataImportConvertScriptButton(String pkField) {
|
||||
return fieldEditorButton("编辑转换脚本", "fa fa-code",
|
||||
"SYS_DATAIMPORTCONFIG", "SYS_DATAIMPORTCONFIG_ID", pkField, "CONVERTSCRIPT", "java");
|
||||
}
|
||||
|
||||
private static Map<String, Object> dataImportSaveScriptButton(String pkField) {
|
||||
return fieldEditorButton("编辑保存脚本", "fa fa-code",
|
||||
"SYS_DATAIMPORTCONFIG", "SYS_DATAIMPORTCONFIG_ID", pkField, "SAVESCRIPT", "java");
|
||||
}
|
||||
|
||||
private static Map<String, Object> viewTemplateXmlButton(String pkField) {
|
||||
return fieldEditorButton("高级配置", "fa fa-code",
|
||||
"VIEW_TEMPLATE", "VIEW_TEMPLATE_ID", pkField, "XML", "xml");
|
||||
}
|
||||
|
||||
private static Map<String, Object> viewPageXmlButton(String pkField) {
|
||||
return fieldEditorButton("高级配置", "fa fa-code",
|
||||
"VIEW_PAGE", "VIEW_PAGE_ID", pkField, "XML", "xml");
|
||||
}
|
||||
|
||||
private static Map<String, Object> viewTemplateCustomXmlButton(String pkField) {
|
||||
return fieldEditorButton("高级配置", "fa fa-code",
|
||||
"VIEW_TEMPLATE_CUSTOM", "VIEW_TEMPLATE_CUSTOM_ID", pkField, "XML", "xml");
|
||||
}
|
||||
|
||||
private static Map<String, Object> viewPageCustomXmlButton(String pkField) {
|
||||
return fieldEditorButton("高级配置", "fa fa-code",
|
||||
"VIEW_PAGE_CUSTOM", "VIEW_PAGE_CUSTOM_ID", pkField, "XML", "xml");
|
||||
}
|
||||
|
||||
private static Map<String, Object> fieldEditorButton(String label, String icon, String tableName,
|
||||
String idField, String pkField,
|
||||
String fieldName, String language) {
|
||||
String selectedId = selectedSingleFieldExpr(pkField == null || pkField.isBlank() ? idField : pkField);
|
||||
Map<String, Object> requestData = mapOf(
|
||||
"tableName", tableName,
|
||||
"idField", idField,
|
||||
"id", selectedId,
|
||||
"fieldName", fieldName);
|
||||
Map<String, Object> saveData = new LinkedHashMap<>(requestData);
|
||||
saveData.put("value", "${value}");
|
||||
Map<String, Object> form = mapOf(
|
||||
"type", "form",
|
||||
"id", "field-editor-" + tableName.toLowerCase() + "-" + fieldName.toLowerCase(),
|
||||
"wrapWithPanel", false,
|
||||
"initApi", mapOf(
|
||||
"method", "post",
|
||||
"url", "/api/field-editor/load",
|
||||
"data", requestData),
|
||||
"api", mapOf(
|
||||
"method", "post",
|
||||
"url", "/api/field-editor/save",
|
||||
"data", saveData),
|
||||
"body", List.of(codeEditor("value", label, language, "")));
|
||||
Map<String, Object> btn = new LinkedHashMap<>();
|
||||
btn.put("type", "button");
|
||||
btn.put("id", label);
|
||||
btn.put("label", label);
|
||||
btn.put("icon", icon);
|
||||
btn.put("disabledOn", "${!selectedItems || selectedItems.length !== 1}");
|
||||
btn.put("actionType", "dialog");
|
||||
btn.put("dialog", mapOf(
|
||||
"type", "dialog",
|
||||
"title", label,
|
||||
"size", "xl",
|
||||
"body", form,
|
||||
"actions", formActions()));
|
||||
return btn;
|
||||
}
|
||||
|
||||
private static Map<String, Object> codeEditor(String name, String label, String language, String value) {
|
||||
return mapOf(
|
||||
"type", "editor",
|
||||
"name", name,
|
||||
"label", label,
|
||||
"language", language,
|
||||
"value", value,
|
||||
"size", "lg",
|
||||
"options", mapOf(
|
||||
"minimap", mapOf("enabled", false),
|
||||
"wordWrap", "on",
|
||||
"fontSize", 14));
|
||||
}
|
||||
|
||||
private static List<Object> formActions() {
|
||||
return List.of(
|
||||
mapOf("type", "button", "label", "保存", "level", "primary", "actionType", "submit", "close", true),
|
||||
mapOf("type", "button", "label", "取消", "actionType", "close"));
|
||||
}
|
||||
|
||||
private static Map<String, Object> approvalDrawerButton(String label, String icon, String pkField,
|
||||
boolean readOnly) {
|
||||
Map<String, Object> args = mapOf(
|
||||
|
||||
@@ -1112,10 +1112,10 @@ class TemplateToAmisConverterTest {
|
||||
assertEquals("主动召回", data.get("comment"));
|
||||
}
|
||||
|
||||
/** engineclass=ProcessMonitorComponentNew → 流程监控注入处理明细和结束流程按钮,不注入高级处理假入口。 */
|
||||
/** engineclass=ProcessMonitorComponentNew → 流程监控注入处理明细、高级处理和结束流程按钮。 */
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void engineclass_ProcessMonitorComponentNew_注入处理和结束流程按钮() {
|
||||
void engineclass_ProcessMonitorComponentNew_注入处理高级处理和结束流程按钮() {
|
||||
String xml = "<crud entityid='e1'><display/></crud>";
|
||||
ConversionResult r = converter.convertGraded(xml, null,
|
||||
"com.dsasp.client.wf.ui.process.monitor.ProcessMonitorComponentNew",
|
||||
@@ -1128,13 +1128,14 @@ class TemplateToAmisConverterTest {
|
||||
Map<String, Object> terminate = toolbar.stream()
|
||||
.filter(o -> o instanceof Map && "结束流程".equals(((Map<String, Object>) o).get("label")))
|
||||
.map(o -> (Map<String, Object>) o).findFirst().orElse(null);
|
||||
boolean hasAdvanced = toolbar.stream()
|
||||
.anyMatch(o -> o instanceof Map && "高级处理".equals(((Map<String, Object>) o).get("label")));
|
||||
Map<String, Object> advanced = toolbar.stream()
|
||||
.filter(o -> o instanceof Map && "高级处理".equals(((Map<String, Object>) o).get("label")))
|
||||
.map(o -> (Map<String, Object>) o).findFirst().orElse(null);
|
||||
|
||||
assertEquals("process-monitor-crud", crud.get("id"));
|
||||
assertNotNull(handle, "流程监控应注入「处理」");
|
||||
assertNotNull(advanced, "流程监控应注入真实「高级处理」");
|
||||
assertNotNull(terminate, "流程监控应注入「结束流程」");
|
||||
assertFalse(hasAdvanced, "高级处理需要权限/审计端点,不能生成假入口");
|
||||
|
||||
Map<String, Object> action = (Map<String, Object>) ((List<Object>) ((Map<String, Object>)
|
||||
((Map<String, Object>) handle.get("onEvent")).get("click")).get("actions")).get(0);
|
||||
@@ -1143,6 +1144,14 @@ class TemplateToAmisConverterTest {
|
||||
assertEquals("${selectedItems[0].PM_DEMO_ID}", args.get("processInstanceId"));
|
||||
assertEquals(true, args.get("readOnly"));
|
||||
|
||||
assertEquals("dialog", advanced.get("actionType"));
|
||||
Map<String, Object> advancedDialog = (Map<String, Object>) advanced.get("dialog");
|
||||
Map<String, Object> advancedForm = (Map<String, Object>) advancedDialog.get("body");
|
||||
Map<String, Object> advancedApi = (Map<String, Object>) advancedForm.get("api");
|
||||
assertEquals("/api/workflow/process/${selectedItems[0].PM_DEMO_ID}/advanced-script", advancedApi.get("url"));
|
||||
List<Object> advancedFields = (List<Object>) advancedForm.get("body");
|
||||
assertEquals("editor", ((Map<String, Object>) advancedFields.get(0)).get("type"));
|
||||
|
||||
assertEquals("ajax", terminate.get("actionType"));
|
||||
assertEquals("danger", terminate.get("level"));
|
||||
assertEquals("process-monitor-crud", terminate.get("reload"));
|
||||
@@ -1153,6 +1162,56 @@ class TemplateToAmisConverterTest {
|
||||
assertEquals("流程有误作废处理", data.get("comment"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void engineclass_ScheduleJobDesignComponent_treegrid右侧列表注入编辑任务脚本() {
|
||||
Map<String, Object> crud = new LinkedHashMap<>();
|
||||
crud.put("type", "crud");
|
||||
crud.put("primaryField", "SYS_SCHEDULEJOB_ID");
|
||||
crud.put("headerToolbar", new ArrayList<>(List.of("pagination")));
|
||||
Map<String, Object> schema = Map.of(
|
||||
"type", "page",
|
||||
"body", Map.of(
|
||||
"type", "grid",
|
||||
"columns", List.of(
|
||||
Map.of("body", Map.of("type", "input-tree")),
|
||||
Map.of("body", crud))));
|
||||
|
||||
EngineclassDelta.apply(schema,
|
||||
"com.dsasp.client.tools.schedulejob.ScheduleJobDesignComponent", null);
|
||||
|
||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||
Map<String, Object> scriptBtn = toolbar.stream()
|
||||
.filter(o -> o instanceof Map && "编辑任务脚本".equals(((Map<String, Object>) o).get("label")))
|
||||
.map(o -> (Map<String, Object>) o).findFirst().orElse(null);
|
||||
|
||||
assertNotNull(scriptBtn);
|
||||
Map<String, Object> form = (Map<String, Object>) ((Map<String, Object>) scriptBtn.get("dialog")).get("body");
|
||||
Map<String, Object> api = (Map<String, Object>) form.get("api");
|
||||
assertEquals("/api/field-editor/save", api.get("url"));
|
||||
Map<String, Object> data = (Map<String, Object>) api.get("data");
|
||||
assertEquals("SYS_SCHEDULEJOB", data.get("tableName"));
|
||||
assertEquals("RUNSCRIPT", data.get("fieldName"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void engineclass_DataImportConfigView_注入转换和保存脚本编辑按钮() {
|
||||
String xml = "<crud entityid='e1'><display/></crud>";
|
||||
ConversionResult r = converter.convertGraded(xml, null,
|
||||
"com.dsasp.client.dataimport.view.DataImportConfigView",
|
||||
"数据导入配置管理", new ArrayList<>(), noPage);
|
||||
Map<String, Object> crud = body(r.getSchema());
|
||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||
List<String> labels = toolbar.stream()
|
||||
.filter(Map.class::isInstance)
|
||||
.map(o -> String.valueOf(((Map<String, Object>) o).get("label")))
|
||||
.toList();
|
||||
|
||||
assertTrue(labels.contains("编辑转换脚本"));
|
||||
assertTrue(labels.contains("编辑保存脚本"));
|
||||
}
|
||||
|
||||
/** engineclass=ProcessFormRemoveComponent → 审批表单删除注入查看和历史删除按钮。 */
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
|
||||
@@ -56,4 +56,11 @@ public final class GatewayRequests {
|
||||
public String processInstanceId;
|
||||
public String tableName;
|
||||
}
|
||||
|
||||
/** 流程监控高级处理脚本请求。 */
|
||||
public static class AdvancedScriptRequest {
|
||||
public String script;
|
||||
public String businessKey;
|
||||
public String tableName;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,8 +13,11 @@ import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Properties;
|
||||
import java.util.Set;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.dao.DataAccessException;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
@@ -35,6 +38,8 @@ import com.eip4.platform.flowgateway.client.ProcessInstanceDto;
|
||||
import com.eip4.platform.flowgateway.client.TraceNodeDto;
|
||||
import com.eip4.platform.flowgateway.writeback.StatusWriteback;
|
||||
import com.dsasp.server.common.workflow.service.ProcessCoreService;
|
||||
import com.dsasp.server.core.service.script.FlowScriptBindings;
|
||||
import com.dsasp.server.core.service.script.ScriptingEnginesManager;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -60,6 +65,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@RestController
|
||||
public class TodoController {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(TodoController.class);
|
||||
|
||||
private static final int DEFAULT_AMIS_PER_PAGE = 10;
|
||||
private static final int LEGACY_TASK_FETCH_LIMIT = 1_000;
|
||||
private static final DateTimeFormatter LEGACY_DATE_TIME =
|
||||
@@ -254,6 +261,61 @@ public class TodoController {
|
||||
return ResponseEntity.ok(resp);
|
||||
}
|
||||
|
||||
@Operation(summary = "流程监控高级处理脚本",
|
||||
description = "流程监控页专用:按老系统语义给 Groovy 绑定 processid/businessKey 后执行;失败返回 AMIS status=1。")
|
||||
@PostMapping("/api/workflow/process/{processInstanceId}/advanced-script")
|
||||
public ResponseEntity<Map<String, Object>> runProcessAdvancedScript(
|
||||
@AuthenticationPrincipal AuthPrincipal principal,
|
||||
@PathVariable String processInstanceId,
|
||||
@RequestBody(required = false) GatewayRequests.AdvancedScriptRequest req) {
|
||||
String script = req == null ? null : trim(req.script);
|
||||
if (script == null || script.isBlank()) {
|
||||
return ResponseEntity.ok(amisFail("请输入高级处理脚本"));
|
||||
}
|
||||
ProcessInstanceDto pi = flowableClient.processInstance(processInstanceId);
|
||||
if (pi == null) {
|
||||
return ResponseEntity.ok(amisFail("未找到流程实例"));
|
||||
}
|
||||
String businessKey = firstNonBlank(req == null ? null : req.businessKey, pi.businessKey);
|
||||
Map<String, Object> bindMap = new LinkedHashMap<>();
|
||||
bindMap.put("processid", processInstanceId);
|
||||
bindMap.put("processInstanceId", processInstanceId);
|
||||
bindMap.put("businessKey", businessKey);
|
||||
bindMap.put("tableName", req == null ? null : req.tableName);
|
||||
if (principal != null) {
|
||||
bindMap.put("currentUserId", principal.userId());
|
||||
bindMap.put("currentUserName", principal.name());
|
||||
}
|
||||
|
||||
Properties ctx = new Properties();
|
||||
if (principal != null) {
|
||||
putIfNotBlank(ctx, "CURRENTUSER", principal.userId());
|
||||
putIfNotBlank(ctx, "CURRENTUSERID", principal.userId());
|
||||
putIfNotBlank(ctx, "CURRENTUSERNAME", principal.name());
|
||||
putIfNotBlank(ctx, "CURRENTDEPART", principal.depart());
|
||||
putIfNotBlank(ctx, "CURRENTORG", principal.org());
|
||||
}
|
||||
|
||||
try {
|
||||
String key = "process-monitor:" + processInstanceId + ":" + Integer.toHexString(script.hashCode());
|
||||
ScriptingEnginesManager.getScriptingEnginesManager()
|
||||
.evaluateGroovy(key, script, new FlowScriptBindings(bindMap, ctx));
|
||||
log.info("流程监控高级处理脚本执行成功: processInstanceId={}, businessKey={}, user={}",
|
||||
processInstanceId, businessKey, principal == null ? "" : principal.userId());
|
||||
Map<String, Object> resp = amisOk("执行成功");
|
||||
resp.put("processInstanceId", processInstanceId);
|
||||
resp.put("businessKey", businessKey);
|
||||
return ResponseEntity.ok(resp);
|
||||
} catch (Throwable ex) {
|
||||
if (ex instanceof VirtualMachineError || ex instanceof ThreadDeath) {
|
||||
throw ex;
|
||||
}
|
||||
log.warn("流程监控高级处理脚本执行失败: processInstanceId={}, businessKey={}, user={}, error={}",
|
||||
processInstanceId, businessKey, principal == null ? "" : principal.userId(), ex.getMessage());
|
||||
return ResponseEntity.ok(amisFail("执行失败:" + safeScriptError(ex)));
|
||||
}
|
||||
}
|
||||
|
||||
@Operation(summary = "流程轨迹", description = "返回流程实例的历史任务节点(含当前活动节点),按开始时间升序;包含办理人姓名/审批意见/办理结果")
|
||||
@GetMapping("/api/flow/process/{processInstanceId}/trace")
|
||||
public ResponseEntity<List<TraceNodeDto>> trace(@PathVariable String processInstanceId) {
|
||||
@@ -654,6 +716,34 @@ public class TodoController {
|
||||
return null;
|
||||
}
|
||||
|
||||
private static Map<String, Object> amisOk(String msg) {
|
||||
Map<String, Object> resp = new LinkedHashMap<>();
|
||||
resp.put("status", 0);
|
||||
resp.put("msg", msg);
|
||||
return resp;
|
||||
}
|
||||
|
||||
private static Map<String, Object> amisFail(String msg) {
|
||||
Map<String, Object> resp = new LinkedHashMap<>();
|
||||
resp.put("status", 1);
|
||||
resp.put("msg", msg);
|
||||
return resp;
|
||||
}
|
||||
|
||||
private static void putIfNotBlank(Properties props, String key, String value) {
|
||||
if (notBlank(value)) {
|
||||
props.put(key, value);
|
||||
}
|
||||
}
|
||||
|
||||
private static String safeScriptError(Throwable ex) {
|
||||
String msg = ex.getMessage();
|
||||
if (msg == null || msg.isBlank()) {
|
||||
msg = ex.getClass().getSimpleName();
|
||||
}
|
||||
return msg.replaceAll("[\\r\\n\\t]+", " ").strip();
|
||||
}
|
||||
|
||||
private static String processName(String processDefinitionId) {
|
||||
String s = trim(processDefinitionId);
|
||||
if (s == null || s.isBlank()) {
|
||||
|
||||
@@ -226,6 +226,42 @@ class TodoControllerAmisTest {
|
||||
verify(statusWriteback).updateStatus("BK-1", "OA_NOTICE", ProcessCoreService.STATUS_INVALID);
|
||||
}
|
||||
|
||||
@Test
|
||||
void runProcessAdvancedScript_绑定流程上下文并返回amis成功契约() {
|
||||
ProcessInstanceDto dto = process("PI-1", "BK-1", false, epochMillis(2026, 6, 14, 11, 23));
|
||||
when(flowableClient.processInstance("PI-1")).thenReturn(dto);
|
||||
GatewayRequests.AdvancedScriptRequest req = new GatewayRequests.AdvancedScriptRequest();
|
||||
req.tableName = "OA_NOTICE";
|
||||
req.script = """
|
||||
assert processid == 'PI-1'
|
||||
assert processInstanceId == 'PI-1'
|
||||
assert businessKey == 'BK-1'
|
||||
assert currentUserId == 'U1'
|
||||
assert tableName == 'OA_NOTICE'
|
||||
""";
|
||||
|
||||
Map<String, Object> resp = controller.runProcessAdvancedScript(principal(), "PI-1", req).getBody();
|
||||
|
||||
assertThat(resp).containsEntry("status", 0);
|
||||
assertThat(resp).containsEntry("msg", "执行成功");
|
||||
assertThat(resp).containsEntry("processInstanceId", "PI-1");
|
||||
assertThat(resp).containsEntry("businessKey", "BK-1");
|
||||
verify(flowableClient).processInstance("PI-1");
|
||||
}
|
||||
|
||||
@Test
|
||||
void runProcessAdvancedScript_脚本异常返回amis失败契约() {
|
||||
when(flowableClient.processInstance("PI-1"))
|
||||
.thenReturn(process("PI-1", "BK-1", false, epochMillis(2026, 6, 14, 11, 23)));
|
||||
GatewayRequests.AdvancedScriptRequest req = new GatewayRequests.AdvancedScriptRequest();
|
||||
req.script = "assert false : 'bad script'";
|
||||
|
||||
Map<String, Object> resp = controller.runProcessAdvancedScript(principal(), "PI-1", req).getBody();
|
||||
|
||||
assertThat(resp).containsEntry("status", 1);
|
||||
assertThat((String) resp.get("msg")).contains("执行失败").contains("bad script");
|
||||
}
|
||||
|
||||
private static ProcessInstanceDto process(String id, String businessKey, boolean ended, long startMillis) {
|
||||
ProcessInstanceDto dto = new ProcessInstanceDto();
|
||||
dto.id = id;
|
||||
|
||||
@@ -0,0 +1,127 @@
|
||||
package com.eip4.platform.metadata.web;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import org.springframework.dao.EmptyResultDataAccessException;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.eip4.platform.metadata.security.IdentifierWhitelist;
|
||||
import com.eip4.platform.metadata.security.IllegalIdentifierException;
|
||||
|
||||
/**
|
||||
* 通用字段源码编辑端点。
|
||||
*
|
||||
* <p>用于 framework 定制视图中的 AceEditor 迁移:RUNSCRIPT / CONVERTSCRIPT /
|
||||
* SAVESCRIPT / XML / SENDINFO 等字段由 amis input-editor 编辑。表名和列名先过
|
||||
* {@link IdentifierWhitelist},再叠加一层可编辑字段白名单,避免把它变成任意列更新接口。
|
||||
*/
|
||||
@RestController
|
||||
public class FieldEditorController {
|
||||
|
||||
private static final Pattern IDENTIFIER = Pattern.compile("[A-Za-z][A-Za-z0-9_]*");
|
||||
|
||||
private static final Set<String> EDITABLE_FIELDS = Set.of(
|
||||
"RUNSCRIPT",
|
||||
"CONVERTSCRIPT",
|
||||
"SAVESCRIPT",
|
||||
"XML",
|
||||
"CONTENTXML",
|
||||
"SENDINFO");
|
||||
|
||||
private final JdbcTemplate jdbcTemplate;
|
||||
private final IdentifierWhitelist whitelist;
|
||||
|
||||
public FieldEditorController(JdbcTemplate jdbcTemplate, IdentifierWhitelist whitelist) {
|
||||
this.jdbcTemplate = jdbcTemplate;
|
||||
this.whitelist = whitelist;
|
||||
}
|
||||
|
||||
@PostMapping("/api/field-editor/load")
|
||||
public Map<String, Object> load(@RequestBody FieldEditRequest req) {
|
||||
Identifiers ids = validate(req);
|
||||
try {
|
||||
String value = jdbcTemplate.queryForObject(
|
||||
"SELECT " + ids.fieldName + " FROM " + ids.tableName + " WHERE "
|
||||
+ ids.idField + " = ?",
|
||||
String.class, req.id);
|
||||
Map<String, Object> data = new LinkedHashMap<>();
|
||||
data.put("value", value == null ? "" : value);
|
||||
Map<String, Object> resp = ok("加载成功");
|
||||
resp.put("data", data);
|
||||
return resp;
|
||||
} catch (EmptyResultDataAccessException ex) {
|
||||
return fail("记录不存在或已被删除");
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/api/field-editor/save")
|
||||
public Map<String, Object> save(@RequestBody FieldEditRequest req) {
|
||||
Identifiers ids = validate(req);
|
||||
int updated = jdbcTemplate.update(
|
||||
"UPDATE " + ids.tableName + " SET " + ids.fieldName + " = ? WHERE "
|
||||
+ ids.idField + " = ?",
|
||||
req.value == null ? "" : req.value, req.id);
|
||||
if (updated <= 0) {
|
||||
return fail("记录不存在或已被删除");
|
||||
}
|
||||
return ok("保存成功");
|
||||
}
|
||||
|
||||
private Identifiers validate(FieldEditRequest req) {
|
||||
if (req == null) {
|
||||
throw new IllegalIdentifierException("字段编辑参数为空");
|
||||
}
|
||||
String table = normalizeIdentifier(req.tableName, "实体表名");
|
||||
String idField = normalizeIdentifier(req.idField, "主键列");
|
||||
String field = normalizeIdentifier(req.fieldName, "编辑字段");
|
||||
if (req.id == null || req.id.isBlank()) {
|
||||
throw new IllegalIdentifierException("字段编辑缺少记录主键");
|
||||
}
|
||||
if (!EDITABLE_FIELDS.contains(field)) {
|
||||
throw new IllegalIdentifierException("字段编辑只允许脚本/XML/配置字段");
|
||||
}
|
||||
whitelist.requireLegalTable(table);
|
||||
whitelist.requireLegalColumn(table, idField, "主键列");
|
||||
whitelist.requireLegalColumn(table, field, "编辑字段");
|
||||
return new Identifiers(table, idField, field);
|
||||
}
|
||||
|
||||
private static String normalizeIdentifier(String raw, String name) {
|
||||
if (raw == null || raw.isBlank() || !IDENTIFIER.matcher(raw).matches()) {
|
||||
throw new IllegalIdentifierException(name + "含非法标识符,已拒绝");
|
||||
}
|
||||
return raw.toUpperCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
private static Map<String, Object> ok(String msg) {
|
||||
Map<String, Object> resp = new LinkedHashMap<>();
|
||||
resp.put("status", 0);
|
||||
resp.put("msg", msg);
|
||||
return resp;
|
||||
}
|
||||
|
||||
private static Map<String, Object> fail(String msg) {
|
||||
Map<String, Object> resp = new LinkedHashMap<>();
|
||||
resp.put("status", 1);
|
||||
resp.put("msg", msg);
|
||||
return resp;
|
||||
}
|
||||
|
||||
public static class FieldEditRequest {
|
||||
public String tableName;
|
||||
public String idField;
|
||||
public String id;
|
||||
public String fieldName;
|
||||
public String value;
|
||||
}
|
||||
|
||||
private record Identifiers(String tableName, String idField, String fieldName) {
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
package com.eip4.platform.metadata.web;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
|
||||
import com.eip4.platform.metadata.security.IdentifierWhitelist;
|
||||
import com.eip4.platform.metadata.security.IllegalIdentifierException;
|
||||
|
||||
/** 通用脚本/XML 字段编辑端点单测。 */
|
||||
class FieldEditorControllerTest {
|
||||
|
||||
private final JdbcTemplate jdbcTemplate = mock(JdbcTemplate.class);
|
||||
private final IdentifierWhitelist whitelist = mock(IdentifierWhitelist.class);
|
||||
private final FieldEditorController controller = new FieldEditorController(jdbcTemplate, whitelist);
|
||||
|
||||
@Test
|
||||
void loadAndSave_只拼接已校验标识符并返回amis契约() {
|
||||
FieldEditorController.FieldEditRequest req = request("SYS_SCHEDULEJOB", "SYS_SCHEDULEJOB_ID",
|
||||
"JOB-1", "RUNSCRIPT", "println 2");
|
||||
when(jdbcTemplate.queryForObject(
|
||||
eq("SELECT RUNSCRIPT FROM SYS_SCHEDULEJOB WHERE SYS_SCHEDULEJOB_ID = ?"),
|
||||
eq(String.class), eq("JOB-1"))).thenReturn("println 1");
|
||||
when(jdbcTemplate.update(
|
||||
eq("UPDATE SYS_SCHEDULEJOB SET RUNSCRIPT = ? WHERE SYS_SCHEDULEJOB_ID = ?"),
|
||||
eq("println 2"), eq("JOB-1"))).thenReturn(1);
|
||||
|
||||
Map<String, Object> load = controller.load(req);
|
||||
Map<String, Object> save = controller.save(req);
|
||||
|
||||
assertThat(load).containsEntry("status", 0);
|
||||
assertThat(((Map<?, ?>) load.get("data")).get("value")).isEqualTo("println 1");
|
||||
assertThat(save).containsEntry("status", 0).containsEntry("msg", "保存成功");
|
||||
verify(whitelist, times(2)).requireLegalTable("SYS_SCHEDULEJOB");
|
||||
verify(whitelist, times(2)).requireLegalColumn("SYS_SCHEDULEJOB", "SYS_SCHEDULEJOB_ID", "主键列");
|
||||
verify(whitelist, times(2)).requireLegalColumn("SYS_SCHEDULEJOB", "RUNSCRIPT", "编辑字段");
|
||||
}
|
||||
|
||||
@Test
|
||||
void save_普通业务字段不允许走源码编辑端点() {
|
||||
FieldEditorController.FieldEditRequest req = request("SYS_SCHEDULEJOB", "SYS_SCHEDULEJOB_ID",
|
||||
"JOB-1", "NAME", "evil");
|
||||
|
||||
IllegalIdentifierException ex = assertThrows(IllegalIdentifierException.class,
|
||||
() -> controller.save(req));
|
||||
|
||||
assertThat(ex.getMessage()).contains("只允许脚本/XML/配置字段");
|
||||
}
|
||||
|
||||
private static FieldEditorController.FieldEditRequest request(String tableName, String idField, String id,
|
||||
String fieldName, String value) {
|
||||
FieldEditorController.FieldEditRequest req = new FieldEditorController.FieldEditRequest();
|
||||
req.tableName = tableName;
|
||||
req.idField = idField;
|
||||
req.id = id;
|
||||
req.fieldName = fieldName;
|
||||
req.value = value;
|
||||
return req;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user