[appBuilder] 增加appType国际化的能力

Author: wuayee

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/controller/AppTypeController.java

@@ -11,6 +11,7 @@
 import modelengine.fit.jane.task.gateway.Authenticator;
 import modelengine.fit.jober.aipp.dto.AppTypeDto;
 import modelengine.fit.jober.aipp.service.AppTypeService;
+import modelengine.jade.common.locale.LocaleUtil;
 import modelengine.jade.service.annotations.CarverSpan;
 import modelengine.jade.service.annotations.SpanAttr;
 
@@ -25,6 +26,7 @@
 import modelengine.fitframework.annotation.Component;
 
 import java.util.List;
+import java.util.Locale;
 
 /**
  * 应用业务分类对外接口。
@@ -58,7 +60,8 @@ public AppTypeController(Authenticator authenticator, AppTypeService appTypeServ
     @GetMapping(description = "查询所有应用业务分类")
     public Rsp<List<AppTypeDto>> queryAll(HttpClassicServerRequest request,
         @PathVariable("tenant_id") String tenantId) {
-        return Rsp.ok(this.appTypeService.queryAll(tenantId));
+        Locale locale = LocaleUtil.getLocale();
+        return Rsp.ok(this.appTypeService.queryAll(tenantId, locale.getLanguage()));
     }
 
     /**

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/dto/AppTypeDto.java

@@ -28,4 +28,7 @@ public class AppTypeDto {
 
     @Property(description = "名字")
     private String name;
+
+    @Property(description = "语言类型")
+    private String language;
 }

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/mapper/AppBuilderAppTypeMapper.java

@@ -21,9 +21,10 @@ public interface AppBuilderAppTypeMapper {
      * 查询所有分类信息。
      *
      * @param tenantId 表示租户唯一标识的 {@link String}。
+     * @param language 表示分类的语音类型的 {@link String}。
      * @return 表示分类列表的 {@link List}{@code <}{@link AppBuilderAppTypePo}{@code >}。
      */
-    List<AppBuilderAppTypePo> queryAll(String tenantId);
+    List<AppBuilderAppTypePo> queryAll(String tenantId, String language);
 
     /**
      * 插入一条分类信息。

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/po/AppBuilderAppTypePo.java

@@ -34,4 +34,5 @@ public class AppBuilderAppTypePo {
     private String tenantId;
     private LocalDateTime createAt;
     private LocalDateTime updateAt;
+    private String language;
 }

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/service/AppTypeService.java

@@ -21,9 +21,10 @@ public interface AppTypeService {
      * 查询租户下所有分类定义信息。
      *
      * @param tenantId 表示租户唯一标识的 {@link String}。
+     * @param language 表示分类的语音类型的 {@link String}。
      * @return 表示分类定义信息列表的 {@link List}{@code <}{@link AppTypeDto}{@code >}。
      */
-    List<AppTypeDto> queryAll(String tenantId);
+    List<AppTypeDto> queryAll(String tenantId, String language);
 
     /**
      * 根据应用分类唯一标识和租户唯一标识查询分类信息。

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/service/impl/AppTypeServiceImpl.java

@@ -37,8 +37,8 @@ public AppTypeServiceImpl(AppBuilderAppTypeMapper appBuilderAppTypeMapper) {
     }
 
     @Override
-    public List<AppTypeDto> queryAll(String tenantId) {
-        return this.appBuilderAppTypeMapper.queryAll(tenantId)
+    public List<AppTypeDto> queryAll(String tenantId, String language) {
+        return this.appBuilderAppTypeMapper.queryAll(tenantId, language)
             .stream()
             .map(this::deserialize)
             .collect(Collectors.toList());
@@ -73,15 +73,16 @@ public void update(AppTypeDto dto, String tenantId) {
     private AppBuilderAppTypePo serialize(AppTypeDto dto, String tenantId) {
         LocalDateTime now = LocalDateTime.now();
         return AppBuilderAppTypePo.builder()
-            .id(dto.getId())
-            .name(dto.getName())
-            .tenantId(tenantId)
-            .createAt(now)
-            .updateAt(now)
-            .build();
+                .id(dto.getId())
+                .name(dto.getName())
+                .tenantId(tenantId)
+                .createAt(now)
+                .updateAt(now)
+                .language(dto.getLanguage())
+                .build();
     }
 
     private AppTypeDto deserialize(AppBuilderAppTypePo po) {
-        return AppTypeDto.builder().id(po.getId()).name(po.getName()).build();
+        return AppTypeDto.builder().id(po.getId()).name(po.getName()).language(po.getLanguage()).build();
     }
 }

app-builder/jane/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderAppTypeMapper.xml

@@ -10,15 +10,15 @@
     </resultMap>
 
     <select id="queryAll" resultType="modelengine.fit.jober.aipp.po.AppBuilderAppTypePo" resultMap="ResultMap">
-        SELECT id, name, tenant_id, create_at, update_at
+        SELECT id, name, tenant_id, create_at, update_at, language
         FROM app_builder_app_type
-        WHERE tenant_id = #{tenantId}
+        WHERE tenant_id = #{tenantId} and language = #{language}
         ORDER BY create_at ASC
     </select>
 
     <insert id="insert" parameterType="modelengine.fit.jober.aipp.po.AppBuilderAppTypePo">
-        INSERT INTO app_builder_app_type (id, name, tenant_id, create_at, update_at)
-        VALUES (#{id}, #{name}, #{tenantId}, #{createAt}, #{updateAt})
+        INSERT INTO app_builder_app_type (id, name, tenant_id, create_at, update_at, language)
+        VALUES (#{id}, #{name}, #{tenantId}, #{createAt}, #{updateAt}, #{language})
     </insert>
 
     <update id="update" parameterType="modelengine.fit.jober.aipp.po.AppBuilderAppTypePo">
@@ -35,7 +35,7 @@
     </delete>
 
     <select id="query" resultType="modelengine.fit.jober.aipp.po.AppBuilderAppTypePo" resultMap="ResultMap">
-        SELECT id, name, tenant_id, create_at, update_at
+        SELECT id, name, tenant_id, create_at, update_at, language
         FROM app_builder_app_type
         WHERE id = #{id}
     </select>

app-builder/jane/plugins/aipp-plugin/src/main/resources/sql/data/appbuilder_insert.sql

@@ -175,14 +175,22 @@ VALUES ('c6a2d574ccfb46754hb9de3ac88ef199', 'form_property_opening_content', 'zh
 
 INSERT INTO aipp_system_config(config_key, config_value, config_group, config_parent) VALUES ('system', '{"template": "You ara a prompt generator, Your job is to generate prompt from the input of the user.\n\nThe Prompt must follow the style of the example below:\n\n###\ninput:\n生活助手\n\noutput:\n角色：你是一个智能生活助手。\n背景：作为一款集成多种智能功能的应用程序，你需要熟悉各种智能家居设备、日程安排、健康数据等相关知识。\n技能：智能家居控制照明、温控、安防、日程管理（提醒、安排等）、健康监测（睡眠、运行、饮食等）、信息查询、语音交互等。\n目标：为用户提供便捷。\n限制：你可以访问用户的智能家居设备、日历、健康数据等相关信息，并根据需要进行协作和响应。\n###\n\n**DO NOT GENERATE ANY OTHER CONTENT EXCEPT OF THE PROMPT TEMPLATE**\n\ninput: {{input}}"}', 'template', NULL) ON CONFLICT (config_group, config_key) DO NOTHING;
 
-INSERT INTO "app_builder_app_type" VALUES ('4db152b24f94473ab683b1acbfe3c865', '通用', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:26:11.275326', '2025-01-16 17:26:11.275326') ON CONFLICT (id) DO NOTHING;
-INSERT INTO "app_builder_app_type" VALUES ('ad7fca4851394495a90723eb6bcd6141', '文章写作', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:26:53.880531', '2025-01-16 17:26:53.880531') ON CONFLICT (id) DO NOTHING;
-INSERT INTO "app_builder_app_type" VALUES ('099201eaee2346a7bffd76bbdbfb0c7e', '编程开发', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:27:02.607163', '2025-01-16 17:27:02.607163') ON CONFLICT (id) DO NOTHING;
-INSERT INTO "app_builder_app_type" VALUES ('19301209cff644e0bed7aede966226fa', '金融问数', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:27:15.121579', '2025-01-16 17:27:15.121579') ON CONFLICT (id) DO NOTHING;
-INSERT INTO "app_builder_app_type" VALUES ('dadb32e11d0f49c8b3b2b3b78f32adcb', '知识问答', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:27:24.408541', '2025-01-16 17:27:24.408541') ON CONFLICT (id) DO NOTHING;
-INSERT INTO "app_builder_app_type" VALUES ('bfce7a4f00ea464ca85b1bd691ffe774', '数字人', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:27:31.439755', '2025-01-16 17:27:31.439755') ON CONFLICT (id) DO NOTHING;
-INSERT INTO "app_builder_app_type" VALUES ('b653edb7eb5a49be91abcd2c5877c6ad', '办公效率', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:27:40.941004', '2025-01-16 17:27:40.941004') ON CONFLICT (id) DO NOTHING;
-INSERT INTO "app_builder_app_type" VALUES ('6cca24416a05436390e0a96712a4294e', '企业管理', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:27:50.566101', '2025-01-16 17:27:50.566101') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('4db152b24f94473ab683b1acbfe3c865', '通用', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:26:11.275326', '2025-01-16 17:26:11.275326', 'zh') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('ad7fca4851394495a90723eb6bcd6141', '文章写作', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:26:53.880531', '2025-01-16 17:26:53.880531', 'zh') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('099201eaee2346a7bffd76bbdbfb0c7e', '编程开发', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:27:02.607163', '2025-01-16 17:27:02.607163', 'zh') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('19301209cff644e0bed7aede966226fa', '金融问数', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:27:15.121579', '2025-01-16 17:27:15.121579', 'zh') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('dadb32e11d0f49c8b3b2b3b78f32adcb', '知识问答', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:27:24.408541', '2025-01-16 17:27:24.408541', 'zh') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('bfce7a4f00ea464ca85b1bd691ffe774', '数字人', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:27:31.439755', '2025-01-16 17:27:31.439755', 'zh') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('b653edb7eb5a49be91abcd2c5877c6ad', '办公效率', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:27:40.941004', '2025-01-16 17:27:40.941004', 'zh') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('6cca24416a05436390e0a96712a4294e', '企业管理', '31f20efc7e0848deab6a6bc10fc3021e', '2025-01-16 17:27:50.566101', '2025-01-16 17:27:50.566101', 'zh') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('38a3ac7fed2143f098494cd2cc38ad9b', 'universal', '31f20efc7e0848deab6a6bc10fc3021e', '2025-06-14 07:32:37.029701', '2025-06-14 07:32:37.029701', 'en') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('0abbaea72d944569b9a2b79b14c21f9f', 'article writing', '31f20efc7e0848deab6a6bc10fc3021e', '2025-06-14 07:33:08.523671', '2025-06-14 07:33:08.523671', 'en') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('8659ce374fcf4857b166e8550691de82', 'programming development', '31f20efc7e0848deab6a6bc10fc3021e', '2025-06-14 07:33:18.998468', '2025-06-14 07:33:18.998468', 'en') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('33125c0159d54a868615f8639f7de8ff', 'financial question', '31f20efc7e0848deab6a6bc10fc3021e', '2025-06-14 07:33:38.937197', '2025-06-14 07:33:38.937197', 'en') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('99887c230e56443297fa18c00a2abde1', 'knowledge quiz', '31f20efc7e0848deab6a6bc10fc3021e', '2025-06-14 07:34:54.924854', '2025-06-14 07:34:54.924854', 'en') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('581811d70c044a71ba162d1c343ab6b8', 'digital human', '31f20efc7e0848deab6a6bc10fc3021e', '2025-06-14 07:35:07.338292', '2025-06-14 07:35:07.338292', 'en') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('3220fee69abc480e9fad467ae722d4a6', 'office efficiency', '31f20efc7e0848deab6a6bc10fc3021e', '2025-06-14 07:35:17.995892', '2025-06-14 07:35:17.995892', 'en') ON CONFLICT (id) DO NOTHING;
+INSERT INTO "app_builder_app_type" VALUES ('0ee3c200713c40c9a8c2cc09c157ff5c', 'enterprise management', '31f20efc7e0848deab6a6bc10fc3021e', '2025-06-14 07:35:31.56825', '2025-06-14 07:35:31.56825', 'en') ON CONFLICT (id) DO NOTHING;
 
 INSERT INTO "public"."i18n" ("id", "key", "language", "value") VALUES ('c6a2d574ccfb4687a8b9de3ac88ef1e3', 'semantic_search', 'en', 'Semantic search') ON CONFLICT (id) DO NOTHING;
 INSERT INTO "public"."i18n" ("id", "key", "language", "value") VALUES ('c6a2d574ccfb4687a8b9de3ac88ef1e2', 'semantic_search', 'zh', '语义检索') ON CONFLICT (id) DO NOTHING;

app-builder/jane/plugins/aipp-plugin/src/main/resources/sql/schema/create_tables/appbuilder_create.sql

@@ -291,6 +291,7 @@ create table if not exists app_builder_app_type
     tenant_id  varchar(255) not null,
     create_at  timestamp    not null default current_timestamp,
     update_at  timestamp    not null default current_timestamp,
+    language   varchar(64)  NULL,
     CONSTRAINT "app_builder_app_type_name_tenant_id_key" UNIQUE ("name", "tenant_id")
 );
 

app-builder/jane/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/service/impl/AppTypeServiceImplTest.java

@@ -45,11 +45,12 @@ void shouldCallMapperWhenQueryAll() {
         List<AppBuilderAppTypePo> expectResult = new ArrayList<>();
         String tenantId = "tenant";
         AppBuilderAppTypePo expectType = new AppBuilderAppTypePo("1", "type1", tenantId, LocalDateTime.now(),
-                LocalDateTime.now());
+                LocalDateTime.now(), "zh");
         expectResult.add(expectType);
-        Mockito.when(this.appBuilderAppTypeMapper.queryAll(tenantId)).thenReturn(expectResult);
+        Mockito.when(this.appBuilderAppTypeMapper.queryAll(Mockito.eq(tenantId), Mockito.eq("zh")))
+                .thenReturn(expectResult);
 
-        List<AppTypeDto> result = this.appTypeService.queryAll(tenantId);
+        List<AppTypeDto> result = this.appTypeService.queryAll(tenantId, "zh" );
 
         Assertions.assertEquals(expectResult.size(), result.size());
         Assertions.assertEquals(expectType.getId(), result.get(0).getId());
@@ -60,7 +61,7 @@ void shouldCallMapperWhenQueryAll() {
     void shouldCallMapperWhenQueryById() {
         String tenantId = "tenant";
         AppBuilderAppTypePo expectPo = new AppBuilderAppTypePo("1", "type1", tenantId, LocalDateTime.now(),
-                LocalDateTime.now());
+                LocalDateTime.now(), "zh");
         Mockito.when(this.appBuilderAppTypeMapper.query(expectPo.getId(), tenantId)).thenReturn(expectPo);
 
         AppTypeDto result = this.appTypeService.query(expectPo.getId(), tenantId);
@@ -73,14 +74,16 @@ void shouldCallMapperWhenQueryById() {
     void shouldCallMapperWhenAddGivenTypeWithId() {
         String tenantId = "tenant";
         AppBuilderAppTypePo expectPo = new AppBuilderAppTypePo("1", "type1", tenantId, LocalDateTime.now(),
-                LocalDateTime.now());
+                LocalDateTime.now(), "zh");
         Mockito.doNothing()
                 .when(this.appBuilderAppTypeMapper)
                 .insert(Mockito.argThat(
                         po -> po.getId().equals(expectPo.getId()) && po.getName().equals(expectPo.getName())
                                 && po.getTenantId().equals(expectPo.getTenantId())));
 
-        AppTypeDto result = this.appTypeService.add(new AppTypeDto(expectPo.getId(), expectPo.getName()), tenantId);
+        AppTypeDto result =
+                this.appTypeService.add(new AppTypeDto(expectPo.getId(), expectPo.getName(), expectPo.getLanguage()),
+                        tenantId);
 
         Mockito.verify(this.appBuilderAppTypeMapper, Mockito.times(1)).insert(Mockito.any(AppBuilderAppTypePo.class));
         Assertions.assertEquals(expectPo.getId(), result.getId());
@@ -91,14 +94,15 @@ void shouldCallMapperWhenAddGivenTypeWithId() {
     void shouldReturnNewIdWhenAddGivenTypeWithoutId() {
         String tenantId = "tenant";
         AppBuilderAppTypePo expectPo = new AppBuilderAppTypePo("1", "type1", tenantId, LocalDateTime.now(),
-                LocalDateTime.now());
+                LocalDateTime.now(), "zh");
         Mockito.doNothing()
                 .when(this.appBuilderAppTypeMapper)
                 .insert(Mockito.argThat(
                         po -> !po.getId().isEmpty() && po.getName().equals(expectPo.getName())
                                 && po.getTenantId().equals(expectPo.getTenantId())));
 
-        AppTypeDto result = this.appTypeService.add(new AppTypeDto("", expectPo.getName()), tenantId);
+        AppTypeDto result =
+                this.appTypeService.add(new AppTypeDto("", expectPo.getName(), expectPo.getLanguage()), tenantId);
 
         Mockito.verify(this.appBuilderAppTypeMapper, Mockito.times(1)).insert(Mockito.any(AppBuilderAppTypePo.class));
         Assertions.assertFalse(result.getId().isEmpty());
@@ -109,7 +113,7 @@ void shouldReturnNewIdWhenAddGivenTypeWithoutId() {
     void shouldCallMapperWhenDeleteGivenTypeId() {
         String tenantId = "tenant";
         AppBuilderAppTypePo expectPo = new AppBuilderAppTypePo("1", "type1", tenantId, LocalDateTime.now(),
-                LocalDateTime.now());
+                LocalDateTime.now(), "zh");
         Mockito.doNothing().when(this.appBuilderAppTypeMapper).delete(expectPo.getId(), tenantId);
 
         this.appTypeService.delete(expectPo.getId(), tenantId);
@@ -121,14 +125,15 @@ void shouldCallMapperWhenDeleteGivenTypeId() {
     void shouldCallMapperWhenUpdateGivenTypeInfo() {
         String tenantId = "tenant";
         AppBuilderAppTypePo expectPo = new AppBuilderAppTypePo("1", "type1", tenantId, LocalDateTime.now(),
-                LocalDateTime.now());
+                LocalDateTime.now(), "zh");
         Mockito.doNothing()
                 .when(this.appBuilderAppTypeMapper)
                 .update(Mockito.argThat(
                         po -> po.getId().equals(expectPo.getId()) && po.getName().equals(expectPo.getName())
                                 && po.getTenantId().equals(expectPo.getTenantId())));
 
-        this.appTypeService.update(new AppTypeDto(expectPo.getId(), expectPo.getName()), tenantId);
+        this.appTypeService.update(new AppTypeDto(expectPo.getId(), expectPo.getName(), expectPo.getLanguage()),
+                tenantId);
 
         Mockito.verify(this.appBuilderAppTypeMapper, Mockito.times(1)).update(Mockito.any(AppBuilderAppTypePo.class));
     }