fix: i18n bug

src/main/java/com/tinyengine/it/mapper/I18nEntryMapper.java

@@ -85,7 +85,7 @@ public interface I18nEntryMapper extends BaseMapper<I18nEntry> {
      * @param lang       the lang
      * @return 18 n entry
      */
-    I18nEntryDto findI18nEntriesByKeyAndLang(@Param("key") String entriesKey, @Param("langId") int lang);
+    I18nEntryDto findI18nEntriesByKeyAndLang(@Param("key") String entriesKey, @Param("lang") int lang);
 
     /**
      * Find i 18 n entries by hostand host type list.

src/main/java/com/tinyengine/it/model/dto/SchemaI18n.java

@@ -1,5 +1,6 @@
 package com.tinyengine.it.model.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,6 +14,8 @@
 @Getter
 @Setter
 public class SchemaI18n {
-    private Map<String, String> enUS;
-    private Map<String, String> zhCN;
+
+    private Map<String, String> en_US;
+
+    private Map<String, String> zh_CN;
 }

src/main/java/com/tinyengine/it/model/entity/I18nLang.java

@@ -1,13 +1,16 @@
 
 package com.tinyengine.it.model.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.tinyengine.it.common.base.BaseEntity;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 国际化语言表
@@ -20,13 +23,37 @@
 @Setter
 @TableName("t_i18n_lang")
 @Schema(name = "I18nLang", description = "国际化语言表")
-public class I18nLang extends BaseEntity {
+public class I18nLang {
+
+    @Schema(name = "id", description = "主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
     @Schema(name = "lang", description = "语言代码")
     private String lang;
 
     @Schema(name = "label", description = "语言")
     private String label;
 
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(name = "createdBy", description = "创建人")
+    private String createdBy;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(name = "lastUpdatedBy", description = "最后修改人")
+    private String lastUpdatedBy;
+
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(name = "createdTime", description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createdTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(name = "lastUpdatedTime", description = "更新时间")
+    private LocalDateTime lastUpdatedTime;
+
+
     /**
      * Instantiates a new 18 n lang.
      *

src/main/java/com/tinyengine/it/model/entity/PageTemplate.java

@@ -22,7 +22,7 @@
  */
 @Getter
 @Setter
-@TableName("page_template")
+@TableName("t_page_template")
 @Schema(name = "PageTemplate", description = "页面模板表")
 public class PageTemplate extends BaseEntity {
     @Schema(name = "name", description = "名称")
@@ -38,7 +38,7 @@ public class PageTemplate extends BaseEntity {
     @Schema(name = "published", description = "是否发布：1是，0否")
     private Integer published;
 
-    @Schema(name = "public", description = "公开状态：0,1,2")
+    @Schema(name = "publicStatus", description = "公开状态：0,1,2")
     private Integer publicStatus;
 
     @Schema(name = "type", description = "模版类型")

src/main/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImpl.java

@@ -124,22 +124,23 @@ public static int checkMissingBrace(String jsonString) {
      */
     @Override
     public I18nEntryListResult findAllI18nEntry() {
+        I18nEntryListResult i18nEntriesListResult = new I18nEntryListResult();
         // 获取所属应用/区块的 语言列表 getHostLangs
         List<I18nLang> i18nLangsList = getHostLangs();
         if (i18nLangsList == null || i18nLangsList.isEmpty()) {
-            return null;
+            return i18nEntriesListResult;
         }
         // 获取词条列表
         List<I18nEntryDto> i18nEntriesList = i18nEntryMapper.queryAllI18nEntry();
         if (i18nEntriesList == null) {
-            return null;
+            return i18nEntriesListResult;
         }
         // 格式化词条列表
         SchemaI18n messages = formatEntriesList(i18nEntriesList);
         List<I18nLang> i18nLangsListTemp = i18nLangsList.stream()
                 .map(i18nLang -> new I18nLang(i18nLang.getLang(), i18nLang.getLabel()))
                 .collect(Collectors.toList());
-        I18nEntryListResult i18nEntriesListResult = new I18nEntryListResult();
+
         i18nEntriesListResult.setI18nLangsList(i18nLangsListTemp);
         i18nEntriesListResult.setMessages(messages);
         return i18nEntriesListResult;

src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java

@@ -185,19 +185,19 @@ public SchemaI18n mergeEntries(SchemaI18n appEntries, SchemaI18n blockEntries) {
         SchemaI18n mergedEntries = new SchemaI18n();
 
         // 初始化合并后的语言映射
-        mergedEntries.setEnUS(new HashMap<>());
-        mergedEntries.setZhCN(new HashMap<>());
+        mergedEntries.setEn_US(new HashMap<>());
+        mergedEntries.setZh_CN(new HashMap<>());
 
         // 合并 appEntries
         if (appEntries != null) {
-            mergeMaps(appEntries.getEnUS(), mergedEntries.getEnUS());
-            mergeMaps(appEntries.getZhCN(), mergedEntries.getZhCN());
+            mergeMaps(appEntries.getEn_US(), mergedEntries.getEn_US());
+            mergeMaps(appEntries.getZh_CN(), mergedEntries.getZh_CN());
         }
 
         // 合并 blockEntries
         if (blockEntries != null) {
-            mergeMaps(blockEntries.getEnUS(), mergedEntries.getEnUS());
-            mergeMaps(blockEntries.getZhCN(), mergedEntries.getZhCN());
+            mergeMaps(blockEntries.getEn_US(), mergedEntries.getEn_US());
+            mergeMaps(blockEntries.getZh_CN(), mergedEntries.getZh_CN());
         }
 
         return mergedEntries;

src/main/resources/mappers/PageTemplateMapper.xml

@@ -24,7 +24,7 @@
         <if test="published!=null and published!=''">
             AND published = #{published}
         </if>
-        <if test="public!=null and public!=''">
+        <if test="publicStatus!=null and publicStatus!=''">
             AND `public` = #{publicStatus}
         </if>
         <if test="type!=null and type!=''">
@@ -79,7 +79,7 @@
         <if test="published!=null and published!=''">
             published = #{published},
         </if>
-        <if test="public!=null and public!=''">
+        <if test="publicStatus!=null and publicStatus!=''">
             `public` = #{publicStatus},
         </if>
         <if test="type!=null and type!=''">

src/main/resources/sql/mysql/create_all_tables_ddl_v1.mysql.sql

@@ -365,7 +365,7 @@ create table `t_page_template` (
     `type` varchar(255) not null comment '模板类型',
     `status` varchar(255) not null comment '模板状态',
     `is_preset` tinyint(1) comment '设计预留字段',
-    `image_url` varchar(255) comment '封面图地址',
+    `image_url` longtext comment '封面图地址',
     `description` varchar(2000) comment '描述',
     `platform_id` int not null comment '设计器id',
     `tenant_id` varchar(60) not null comment '租户id',