[app-builder] modify according to reviews

reeeborn33 · reeeborn33 · commit 20de6cc70df9 · 2025-10-10T15:38:16.000+08:00
diff --git a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/task/TaskDecorator.java b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/task/TaskDecorator.java
@@ -111,7 +111,7 @@ private Object invokeMethod(Method method, Object[] args, Object current)
                 else {
                     msg = localeService.localize(UI_WORD_KEY);
                 }
-                this.aippLogService.insertLogWithInterception(AippInstLogType.ERROR.name(),
+                this.aippLogService.insertLog(AippInstLogType.ERROR.name(),
                         AippLogData.builder().msg(msg).build(), ctx.getBusinessData());
                 return null;
             }
diff --git a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/taskinstance/TaskInstanceDecorator.java b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/domains/taskinstance/TaskInstanceDecorator.java
@@ -142,7 +142,7 @@ private Object wrapException(AppTaskInstanceService instanceService, AippLogServ
                         .setStatus(MetaInstStatusEnum.ERROR.name())
                         .build(), ctx.getOperationContext());
                 // 更新日志类型为HIDDEN_FORM
-                logService.insertLogWithInterception(AippInstLogType.ERROR.name(), AippLogData.builder().msg(e.getMessage()).build(),
+                logService.insertLog(AippInstLogType.ERROR.name(), AippLogData.builder().msg(e.getMessage()).build(),
                         ctx.getBusinessData());
             }
             return null;
diff --git a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/AippFlowEndCallback.java b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/AippFlowEndCallback.java
@@ -186,7 +186,7 @@ private String saveFormToLog(String appId, Map<String, Object> businessData, Str
         logData.setFormAppearance(JsonUtils.toJsonString(formDataMap.get(AippConst.FORM_APPEARANCE_KEY)));
         logData.setFormData(JsonUtils.toJsonString(formDataMap.get(AippConst.FORM_DATA_KEY)));
         // 子应用/工作流的结束节点表单不需要在历史记录展示
-        return this.aippLogService.insertLogWithInterception((this.isExistParent(businessData)
+        return this.aippLogService.insertLog((this.isExistParent(businessData)
                 ? AippInstLogType.HIDDEN_FORM
                 : AippInstLogType.FORM).name(), logData, businessData);
     }
@@ -211,7 +211,7 @@ private void logFinalOutput(Map<String, Object> businessData, String aippInstId)
         if (!checkEnableLog(businessData)) {
             logType = AippInstLogType.HIDDEN_MSG;
         }
-        this.aippLogService.insertLogWithInterception(logType.name(), AippLogData.builder().msg(logMsg).build(), businessData);
+        this.aippLogService.insertLog(logType.name(), AippLogData.builder().msg(logMsg).build(), businessData);
         this.beanContainer.all(AppFlowFinishObserver.class)
                 .stream()
                 .<AppFlowFinishObserver>map(BeanFactory::get)
diff --git a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/AippFlowSmartFormHandle.java b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/AippFlowSmartFormHandle.java
@@ -179,7 +179,7 @@ private String insertFormLog(List<AppBuilderFormProperty> formProperties, String
         Object appearance = formDataMap.get(AippConst.FORM_APPEARANCE_KEY);
         logData.setFormAppearance(ObjectUtils.cast(JsonUtils.toJsonString(appearance)));
         logData.setFormData(ObjectUtils.cast(JsonUtils.toJsonString(formDataMap.get(AippConst.FORM_DATA_KEY))));
-        return this.aippLogService.insertLogWithInterception(AippInstLogType.FORM.name(), logData, businessData);
+        return this.aippLogService.insertLog(AippInstLogType.FORM.name(), logData, businessData);
     }
 
     private void updateInstance(String sheetId, String nodeId, Map<String, Object> businessData) {
diff --git a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/LlmComponent.java b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/LlmComponent.java
@@ -291,7 +291,7 @@ private void addAnswer(AippLlmMeta llmMeta, String answer, Map<String, Object> p
             llmOutput.put("output", output);
             Optional<ResponsibilityResult> formatOutput = this.formatterChain.handle(llmOutput);
             String logMsg = formatOutput.map(ResponsibilityResult::text).orElse(answer);
-            this.aippLogService.insertLogWithInterception(AippInstLogType.META_MSG.name(),
+            this.aippLogService.insertLog(AippInstLogType.META_MSG.name(),
                     AippLogData.builder().msg(logMsg).build(),
                     businessData);
         }
diff --git a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/ReplyNode.java b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/ReplyNode.java
@@ -27,14 +27,14 @@
  */
 @Component
 public class ReplyNode implements FlowableService {
-    private final AippLogService aippLogService;
-
-    private final TemplateService templateService;
-
     private final static String TEMPLATE_KEY = "template";
 
     private final static String VARIABLES_KEY = "variables";
 
+    private final AippLogService aippLogService;
+
+    private final TemplateService templateService;
+
     public ReplyNode(AippLogService aippLogService, TemplateService templateService) {
         this.aippLogService = aippLogService;
         this.templateService = templateService;
@@ -52,7 +52,7 @@ public List<Map<String, Object>> handleTask(List<Map<String, Object>> flowData)
     }
 
     private void sendMsg(String msg, Map<String, Object> businessData) {
-        this.aippLogService.insertLogWithInterception(AippInstLogType.MSG.name(),
+        this.aippLogService.insertLog(AippInstLogType.MSG.name(),
                 AippLogData.builder().msg(msg).build(),
                 businessData);
     }
diff --git a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/service/AippLogService.java b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/service/AippLogService.java
@@ -93,7 +93,7 @@ public interface AippLogService {
      * @param businessData 业务数据
      * @return 返回插入的日志id
      */
-    String insertLogWithInterception(String logType, AippLogData logData, Map<String, Object> businessData);
+    String insertLog(String logType, AippLogData logData, Map<String, Object> businessData);
 
     /**
      * 插入ERROR类型的历史记录
@@ -185,13 +185,4 @@ List<AippInstLogDataDto> queryAippRecentInstLogAfterSplice(String aippId, String
      * @param logIds 表示指定的日志 id 列表的 {@link List}{@code <}{@link Long}{@code >}。
      */
     void deleteLogs(List<Long> logIds);
-
-    /**
-     * 插入一条日志记录，但不触发发送逻辑。
-     *
-     * @param logType 表示日志类型的 {@link String}。
-     * @param logData 表示日志主体数据的 {@link AippLogData} 实例。
-     * @param businessData 表示业务数据的 {@link Map}{@code <}{@link String}{@code , }{@link Object}{@code >}。
-     */
-    void insertLog(String logType, AippLogData logData, Map<String, Object> businessData);
 }
diff --git a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/service/impl/AippLogServiceImpl.java b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/service/impl/AippLogServiceImpl.java
@@ -362,7 +362,7 @@ public void deleteAippPreviewLog(String previewAippId, OperationContext context)
      * @return 日志id
      */
     @Override
-    public String insertLogWithInterception(String logType, AippLogData logData, Map<String, Object> businessData) {
+    public String insertLog(String logType, AippLogData logData, Map<String, Object> businessData) {
         AippLogCreateDto logCreateDto = this.buildAippLogCreateDto(logType, logData, businessData);
         if (logCreateDto == null) {
             return null;
@@ -416,7 +416,7 @@ private Boolean isEnableLog(Map<String, Object> businessData) {
     @Override
     public void insertErrorLog(String msg, List<Map<String, Object>> flowData) {
         AippLogData logData = AippLogData.builder().msg(msg).build();
-        insertLogWithInterception(AippInstLogType.ERROR.name(), logData, DataUtils.getBusiness(flowData));
+        this.insertLog(AippInstLogType.ERROR.name(), logData, DataUtils.getBusiness(flowData));
     }
 
     /**
@@ -512,13 +512,4 @@ public void deleteLogs(List<Long> logIds) {
         }
         this.aippLogMapper.deleteInstanceLogs(logIds);
     }
-
-    @Override
-    public void insertLog(String logType, AippLogData logData, Map<String, Object> businessData) {
-        AippLogCreateDto logCreateDto = this.buildAippLogCreateDto(logType, logData, businessData);
-        if (logCreateDto == null) {
-            return;
-        }
-        this.aippLogMapper.insertOne(logCreateDto);
-    }
 }
diff --git a/app-builder/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/domains/task/TaskDecoratorTest.java b/app-builder/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/domains/task/TaskDecoratorTest.java
@@ -66,7 +66,7 @@ public void testException() {
 
         doNothing().when(this.appTaskInstanceService).update(any(), any());
         when(this.localeService.localize(any())).thenReturn("xxxxxxx");
-        when(this.aippLogService.insertLogWithInterception(any(), any(), any())).thenReturn("xxxxxx");
+        when(this.aippLogService.insertLog(any(), any(), any())).thenReturn("xxxxxx");
 
         // when.
         RunContext runContext = new RunContext(businessData, new OperationContext());
@@ -84,6 +84,6 @@ public void testException() {
         Assertions.assertEquals(MetaInstStatusEnum.ERROR.name(), instance.getEntity().getStatus().get());
 
         verify(this.localeService, times(1)).localize(eq("aipp.service.impl.AippRunTimeServiceImpl"));
-        verify(this.aippLogService, times(1)).insertLogWithInterception(eq(AippInstLogType.ERROR.name()), any(), any());
+        verify(this.aippLogService, times(1)).insertLog(eq(AippInstLogType.ERROR.name()), any(), any());
     }
 }
diff --git a/app-builder/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/domains/taskinstance/TaskInstanceDecoratorTest.java b/app-builder/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/domains/taskinstance/TaskInstanceDecoratorTest.java
@@ -109,7 +109,7 @@ public void testExceptionLogWhenThrowException() {
                 .exceptionLog(this.appTaskInstanceService, this.logService)
                 .run(runContext, null);
         verify(this.appTaskInstanceService, times(1)).update(any(), any());
-        verify(this.logService, times(1)).insertLogWithInterception(any(), any(), any());
+        verify(this.logService, times(1)).insertLog(any(), any(), any());
     }
 
     @Test
@@ -126,6 +126,6 @@ public void testChatAndExceptionLog() {
         verify(this.appChatSessionService, times(1)).addSession(any(), any());
         verify(this.appChatSSEService, times(2)).send(any(), any());
         verify(this.appTaskInstanceService, times(0)).update(any(), any());
-        verify(this.logService, times(0)).insertLogWithInterception(any(), any(), any());
+        verify(this.logService, times(0)).insertLog(any(), any(), any());
     }
 }
diff --git a/app-builder/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/fitable/AippFlowEndCallbackTest.java b/app-builder/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/fitable/AippFlowEndCallbackTest.java
@@ -156,7 +156,7 @@ void should_ok_when_callback_with_normal_formatter_chain() {
         }).when(this.formatterChain).handle(any());
 
         this.aippFlowEndCallback.callback(TestUtils.buildFlowDataWithExtraConfig(buildBusinessData(), null));
-        verify(this.aippLogService).insertLogWithInterception(eq(AippInstLogType.META_MSG.name()), any(), any());
+        verify(this.aippLogService).insertLog(eq(AippInstLogType.META_MSG.name()), any(), any());
     }
 
     @Test
@@ -179,7 +179,7 @@ void test_callback_should_ok_when_test_with_form_data() {
 
         this.aippFlowEndCallback.callback(TestUtils.buildFlowDataWithExtraConfig(businessData, null));
         verify(this.conversationRecordService).insertConversationRecord(any());
-        verify(this.aippLogService).insertLogWithInterception(eq(AippInstLogType.FORM.name()), any(), any());
+        verify(this.aippLogService).insertLog(eq(AippInstLogType.FORM.name()), any(), any());
     }
 
     static class MessageItemStub implements MessageItem {
diff --git a/app-builder/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/fitable/ReplyNodeTest.java b/app-builder/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/fitable/ReplyNodeTest.java
@@ -1,3 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) 2025 Huawei Technologies Co., Ltd. All rights reserved.
+ *  This file is a part of the ModelEngine Project.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 package modelengine.fit.jober.aipp.fitable;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -23,7 +29,7 @@
 import java.util.Map;
 
 /**
- * {@link ReplyNode}的测试用例.
+ * {@link ReplyNode}的测试用例。
  *
  * @author 孙怡菲
  * @since 2025-09-17
@@ -62,7 +68,7 @@ void shouldOkAndInsertLog() {
         assertEquals(flowData, result);
 
         ArgumentCaptor<AippLogData> logCaptor = ArgumentCaptor.forClass(AippLogData.class);
-        verify(this.aippLogService, times(1)).insertLogWithInterception(
+        verify(this.aippLogService, times(1)).insertLog(
                 eq(AippInstLogType.MSG.name()),
                 logCaptor.capture(),
                 eq(businessData)
diff --git a/app-builder/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/service/AippLogServiceTest.java b/app-builder/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/service/AippLogServiceTest.java
@@ -424,7 +424,7 @@ void shouldReturnNullWhenCallInsertLogWithInvalidFormData() {
         Map<String, Object> businessData = MapBuilder.get(() -> new HashMap<String, Object>())
                 .put(AippConst.BS_HTTP_CONTEXT_KEY, "{\"account\":\"123\"}")
                 .build();
-        Assertions.assertNull(this.aippLogService.insertLogWithInterception(AippInstLogType.FORM.name(), aippLogData, businessData));
+        Assertions.assertNull(this.aippLogService.insertLog(AippInstLogType.FORM.name(), aippLogData, businessData));
     }
 
     @Test
@@ -433,7 +433,7 @@ void shouldThrowWhenCallInsertLogWithInvalidMsgData() {
         Map<String, Object> businessData = MapBuilder.get(() -> new HashMap<String, Object>())
                 .put(AippConst.BS_HTTP_CONTEXT_KEY, "{\"account\":\"123\"}").build();
         Assertions.assertThrows(NullPointerException.class,
-                () -> this.aippLogService.insertLogWithInterception(AippInstLogType.MSG.name(), aippLogData, businessData));
+                () -> this.aippLogService.insertLog(AippInstLogType.MSG.name(), aippLogData, businessData));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ private Object invokeMethod(Method method, Object[] args, Object current)`
`111`	`111`	`else {`
`112`	`112`	`msg = localeService.localize(UI_WORD_KEY);`
`113`	`113`	`}`
`114`		`- this.aippLogService.insertLogWithInterception(AippInstLogType.ERROR.name(),`
	`114`	`+ this.aippLogService.insertLog(AippInstLogType.ERROR.name(),`
`115`	`115`	`AippLogData.builder().msg(msg).build(), ctx.getBusinessData());`
`116`	`116`	`return null;`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ private Object wrapException(AppTaskInstanceService instanceService, AippLogServ`
`142`	`142`	`.setStatus(MetaInstStatusEnum.ERROR.name())`
`143`	`143`	`.build(), ctx.getOperationContext());`
`144`	`144`	`// 更新日志类型为HIDDEN_FORM`
`145`		`- logService.insertLogWithInterception(AippInstLogType.ERROR.name(), AippLogData.builder().msg(e.getMessage()).build(),`
	`145`	`+ logService.insertLog(AippInstLogType.ERROR.name(), AippLogData.builder().msg(e.getMessage()).build(),`
`146`	`146`	`ctx.getBusinessData());`
`147`	`147`	`}`
`148`	`148`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ private String insertFormLog(List<AppBuilderFormProperty> formProperties, String`
`179`	`179`	`Object appearance = formDataMap.get(AippConst.FORM_APPEARANCE_KEY);`
`180`	`180`	`logData.setFormAppearance(ObjectUtils.cast(JsonUtils.toJsonString(appearance)));`
`181`	`181`	`logData.setFormData(ObjectUtils.cast(JsonUtils.toJsonString(formDataMap.get(AippConst.FORM_DATA_KEY))));`
`182`		`- return this.aippLogService.insertLogWithInterception(AippInstLogType.FORM.name(), logData, businessData);`
	`182`	`+ return this.aippLogService.insertLog(AippInstLogType.FORM.name(), logData, businessData);`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`private void updateInstance(String sheetId, String nodeId, Map<String, Object> businessData) {`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ private void addAnswer(AippLlmMeta llmMeta, String answer, Map<String, Object> p`
`291`	`291`	`llmOutput.put("output", output);`
`292`	`292`	`Optional<ResponsibilityResult> formatOutput = this.formatterChain.handle(llmOutput);`
`293`	`293`	`String logMsg = formatOutput.map(ResponsibilityResult::text).orElse(answer);`
`294`		`- this.aippLogService.insertLogWithInterception(AippInstLogType.META_MSG.name(),`
	`294`	`+ this.aippLogService.insertLog(AippInstLogType.META_MSG.name(),`
`295`	`295`	`AippLogData.builder().msg(logMsg).build(),`
`296`	`296`	`businessData);`
`297`	`297`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public void testException() {`
`66`	`66`
`67`	`67`	`doNothing().when(this.appTaskInstanceService).update(any(), any());`
`68`	`68`	`when(this.localeService.localize(any())).thenReturn("xxxxxxx");`
`69`		`- when(this.aippLogService.insertLogWithInterception(any(), any(), any())).thenReturn("xxxxxx");`
	`69`	`+ when(this.aippLogService.insertLog(any(), any(), any())).thenReturn("xxxxxx");`
`70`	`70`
`71`	`71`	`// when.`
`72`	`72`	`RunContext runContext = new RunContext(businessData, new OperationContext());`
`@@ -84,6 +84,6 @@ public void testException() {`
`84`	`84`	`Assertions.assertEquals(MetaInstStatusEnum.ERROR.name(), instance.getEntity().getStatus().get());`
`85`	`85`
`86`	`86`	`verify(this.localeService, times(1)).localize(eq("aipp.service.impl.AippRunTimeServiceImpl"));`
`87`		`- verify(this.aippLogService, times(1)).insertLogWithInterception(eq(AippInstLogType.ERROR.name()), any(), any());`
	`87`	`+ verify(this.aippLogService, times(1)).insertLog(eq(AippInstLogType.ERROR.name()), any(), any());`
`88`	`88`	`}`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public void testExceptionLogWhenThrowException() {`
`109`	`109`	`.exceptionLog(this.appTaskInstanceService, this.logService)`
`110`	`110`	`.run(runContext, null);`
`111`	`111`	`verify(this.appTaskInstanceService, times(1)).update(any(), any());`
`112`		`- verify(this.logService, times(1)).insertLogWithInterception(any(), any(), any());`
	`112`	`+ verify(this.logService, times(1)).insertLog(any(), any(), any());`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`@Test`
`@@ -126,6 +126,6 @@ public void testChatAndExceptionLog() {`
`126`	`126`	`verify(this.appChatSessionService, times(1)).addSession(any(), any());`
`127`	`127`	`verify(this.appChatSSEService, times(2)).send(any(), any());`
`128`	`128`	`verify(this.appTaskInstanceService, times(0)).update(any(), any());`
`129`		`- verify(this.logService, times(0)).insertLogWithInterception(any(), any(), any());`
	`129`	`+ verify(this.logService, times(0)).insertLog(any(), any(), any());`
`130`	`130`	`}`
`131`	`131`	`}`