feat: 代码生成 Beta 公测版本

2024-07-28 23:33:08 +08:00
parent 41917686b1
commit 8888829437
40 changed files with 556 additions and 384 deletions
--- a/src/main/java/com/youlai/system/config/property/GeneratorProperties.java
+++ b/src/main/java/com/youlai/system/config/property/GeneratorProperties.java
@@ -19,13 +19,34 @@ import java.util.Map;
@Data
 public class GeneratorProperties {

+
+    /**
+     * 默认配置
+     */
+    private DefaultConfig defaultConfig ;
+
+    /**
+     * 模板配置
+     */
    private Map<String, TemplateConfig> templateConfigs = MapUtil.newHashMap(true);

+
+    /**
+     * 后端应用名
+     */
+
+    private String backendAppName;
+
+    /**
+     * 前端应用名
+     */
+    private String frontendAppName;
+
    /**
     * 模板配置
     */
    @Data
-    public static  class TemplateConfig{
+    public static class TemplateConfig {

        private String templatePath;

@@ -34,7 +55,18 @@ public class GeneratorProperties {
        /**
         * 文件扩展名，如 .java
         */
-        private String extension= FileNameUtil.EXT_JAVA;
+        private String extension = FileNameUtil.EXT_JAVA;
+
+    }
+
+    /**
+     * 默认配置
+     */
+    @Data
+    public static class DefaultConfig {
+
+        private String author;
+

    }

--- a/src/main/java/com/youlai/system/controller/GeneratorController.java
+++ b/src/main/java/com/youlai/system/controller/GeneratorController.java
@@ -3,7 +3,6 @@ package com.youlai.system.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.system.common.result.PageResult;
 import com.youlai.system.common.result.Result;
-import com.youlai.system.model.bo.TableMetaData;
 import com.youlai.system.model.form.GenConfigForm;
 import com.youlai.system.model.query.TablePageQuery;
 import com.youlai.system.model.vo.GeneratorPreviewVO;
@@ -33,18 +32,18 @@ public class GeneratorController {

    @Operation(summary = "获取数据表分页列表")
    @GetMapping("/table/page")
-    public PageResult<TableMetaData> getTablePage(
+    public PageResult<TablePageVO> getTablePage(
            TablePageQuery queryParams
    ) {
-        Page<TableMetaData> result = generatorService.getTablePage(queryParams);
+        Page<TablePageVO> result = generatorService.getTablePage(queryParams);
        return PageResult.success(result);
    }

    @Operation(summary = "获取代码生成配置")
    @GetMapping("/{tableName}/config")
-    public Result<GenConfigForm> getGenConfig(
+    public Result<GenConfigForm> getGenConfigFormData(
            @Parameter(description = "表名", example = "sys_user") @PathVariable String tableName) {
-        GenConfigForm formData = generatorService.getGenConfig(tableName);
+        GenConfigForm formData = generatorService.getGenConfigFormData(tableName);
        return Result.success(formData);
    }

--- a/src/main/java/com/youlai/system/controller/SysUserController.java
+++ b/src/main/java/com/youlai/system/controller/SysUserController.java
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.youlai.system.common.result.PageResult;
 import com.youlai.system.common.result.Result;
-import com.youlai.system.common.util.ExcelUtils;
+import com.youlai.system.util.ExcelUtils;
 import com.youlai.system.enums.LogModuleEnum;
 import com.youlai.system.model.dto.UserImportDTO;
 import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
--- a/src/main/java/com/youlai/system/enums/FormTypeEnum.java
+++ b/src/main/java/com/youlai/system/enums/FormTypeEnum.java
@@ -32,20 +32,20 @@ public enum FormTypeEnum implements IBaseEnum<Integer> {
     */
    RADIO(3, "单选框"),

+    /**
+     * 复选框
+     */
+    CHECK_BOX(4, "复选框"),
+
    /**
     * 数字输入框
     */
-    INPUT_NUMBER(4, "数字输入框"),
+    INPUT_NUMBER(5, "数字输入框"),

    /**
     * 开关
     */
-    SWITCH(5, "开关"),
-
-    /**
-     * 复选框
-     */
-    CHECK_BOX(6, "复选框"),
+    SWITCH(6, "开关"),

    /**
     * 文本域
@@ -60,7 +60,7 @@ public enum FormTypeEnum implements IBaseEnum<Integer> {
    /**
     * 日期框
     */
-    DATE(9, "日期框"),;
+    DATE(9, "日期框");


    //  Mybatis-Plus 提供注解表示插入数据库时插入该值
--- a/src/main/java/com/youlai/system/enums/JavaTypeEnum.java
+++ b/src/main/java/com/youlai/system/enums/JavaTypeEnum.java
@@ -0,0 +1,84 @@
+package com.youlai.system.enums;
+
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 表单类型枚举
+ *
+ * @author Ray
+ * @since 2.10.0
+ */
+@Getter
+public enum JavaTypeEnum {
+
+    VARCHAR("varchar", "String", "string"),
+    CHAR("char", "String", "string"),
+    BLOB("blob", "byte[]", "Uint8Array"),
+    TEXT("text", "String", "string"),
+    JSON("json", "String", "any"),
+    INTEGER("int", "Integer", "number"),
+    TINYINT("tinyint", "Integer", "number"),
+    SMALLINT("smallint", "Integer", "number"),
+    MEDIUMINT("mediumint", "Integer", "number"),
+    BIGINT("bigint", "Long", "bigint"),
+    FLOAT("float", "Float", "number"),
+    DOUBLE("double", "Double", "number"),
+    DECIMAL("decimal", "BigDecimal", "number"),
+    DATE("date", "LocalDate", "Date"),
+    DATETIME("datetime", "LocalDateTime", "Date");
+
+    // 数据库类型
+    private final String dbType;
+    // Java类型
+    private final String javaType;
+    // TypeScript类型
+    private final String tsType;
+
+    // 数据库类型和Java类型的映射
+    private static final Map<String, JavaTypeEnum> typeMap = new HashMap<>();
+
+    // 初始化映射关系
+    static {
+        for (JavaTypeEnum javaTypeEnum : JavaTypeEnum.values()) {
+            typeMap.put(javaTypeEnum.getDbType(), javaTypeEnum);
+        }
+    }
+
+    JavaTypeEnum(String dbType, String javaType, String tsType) {
+        this.dbType = dbType;
+        this.javaType = javaType;
+        this.tsType = tsType;
+    }
+
+    /**
+     * 根据数据库类型获取对应的Java类型
+     *
+     * @param dbType 数据库类型
+     * @return 对应的Java类型
+     */
+    public static String getJavaTypeByDbType(String dbType) {
+        JavaTypeEnum javaTypeEnum = typeMap.get(dbType);
+        if (javaTypeEnum != null) {
+            return javaTypeEnum.getJavaType();
+        }
+        return null;
+    }
+
+    /**
+     * 根据Java类型获取对应的TypeScript类型
+     *
+     * @param javaType Java类型
+     * @return 对应的TypeScript类型
+     */
+    public static String getTsTypeByJavaType(String javaType) {
+        for (JavaTypeEnum javaTypeEnum : JavaTypeEnum.values()) {
+            if (javaTypeEnum.getJavaType().equals(javaType)) {
+                return javaTypeEnum.getTsType();
+            }
+        }
+        return null;
+    }
+}
--- a/src/main/java/com/youlai/system/enums/QueryTypeEnum.java
+++ b/src/main/java/com/youlai/system/enums/QueryTypeEnum.java
@@ -17,38 +17,39 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
 public enum QueryTypeEnum implements IBaseEnum<Integer> {

-
+    /** 等于 */
    EQ(1, "="),

+    /** 模糊匹配 */
+    LIKE(2, "LIKE '%s%'"),

-    NE(2, "!="),
+    /** 包含 */
+    IN(3, "IN"),

+    /** 范围 */
+    BETWEEN(4, "BETWEEN"),

-    GT(3, ">"),
+    /** 大于 */
+    GT(5, ">"),

+    /** 大于等于 */
+    GE(6, ">="),

-    GE(4, ">="),
+    /** 小于 */
+    LT(7, "<"),

-    LT(5, "<"),
+    /** 小于等于 */
+    LE(8, "<="),

-    LE(6, "<="),
+    /** 不等于 */
+    NE(9, "!="),

-    BETWEEN(7, "BETWEEN"),
+    /** 左模糊匹配 */
+    LIKE_LEFT(10, "LIKE '%s'"),

-    LIKE(8, "LIKE '%s%'"),
+    /** 右模糊匹配 */
+    LIKE_RIGHT(11, "LIKE 's%'");

-    LIKE_LEFT(9, "LIKE '%s'"),
-
-    LIKE_RIGHT(10, "LIKE 's%'"),
-
-    IN(11, "IN"),
-
-    NOT_IN(12, "NOT IN"),
-
-    IS_NULL(13, "IS NULL"),
-
-    IS_NOT_NULL(14, "IS NOT NULL")
-    ;

    // 存储在数据库中的枚举属性值
    @EnumValue
--- a/src/main/java/com/youlai/system/filter/CaptchaValidationFilter.java
+++ b/src/main/java/com/youlai/system/filter/CaptchaValidationFilter.java
@@ -4,7 +4,7 @@ import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.util.StrUtil;
 import com.youlai.system.common.constant.SecurityConstants;
 import com.youlai.system.common.result.ResultCode;
-import com.youlai.system.common.util.ResponseUtils;
+import com.youlai.system.util.ResponseUtils;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
--- a/src/main/java/com/youlai/system/filter/JwtValidationFilter.java
+++ b/src/main/java/com/youlai/system/filter/JwtValidationFilter.java
@@ -8,7 +8,7 @@ import cn.hutool.jwt.JWTUtil;
 import com.youlai.system.common.constant.SecurityConstants;
 import com.youlai.system.common.result.ResultCode;
 import com.youlai.system.security.util.JwtUtils;
-import com.youlai.system.common.util.ResponseUtils;
+import com.youlai.system.util.ResponseUtils;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
--- a/src/main/java/com/youlai/system/mapper/DatabaseMapper.java
+++ b/src/main/java/com/youlai/system/mapper/DatabaseMapper.java
@@ -6,7 +6,6 @@ import com.youlai.system.model.bo.ColumnMetaData;
 import com.youlai.system.model.bo.TableMetaData;
 import com.youlai.system.model.entity.SysDept;
 import com.youlai.system.model.query.TablePageQuery;
-import com.youlai.system.model.vo.TableColumnVO;
 import com.youlai.system.model.vo.TablePageVO;
 import org.apache.ibatis.annotations.Mapper;

@@ -23,7 +22,7 @@ import java.util.List;
 public interface DatabaseMapper extends BaseMapper<SysDept> {


-    Page<TableMetaData> getTablePage(Page<TableMetaData> page, TablePageQuery queryParams);
+    Page<TablePageVO> getTablePage(Page<TablePageVO> page, TablePageQuery queryParams);

    List<ColumnMetaData> getTableColumns(String tableName);

--- a/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java
+++ b/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java
@@ -1,7 +1,9 @@
 package com.youlai.system.model.entity;

+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.youlai.system.common.base.BaseEntity;
 import com.youlai.system.enums.FormTypeEnum;
 import com.youlai.system.enums.QueryTypeEnum;
@@ -53,7 +55,7 @@ public class GenFieldConfig extends BaseEntity {
    /**
     * 字段描述
     */
-    private String comment;
+    private String fieldComment;

    /**
     * 表单类型
@@ -86,4 +88,12 @@ public class GenFieldConfig extends BaseEntity {
    private Integer isRequired;


+    /**
+     * TypeScript类型
+     */
+    @TableField(exist = false)
+    @JsonIgnore
+    private String tsType;
+
+
 }
--- a/src/main/java/com/youlai/system/model/form/GenConfigForm.java
+++ b/src/main/java/com/youlai/system/model/form/GenConfigForm.java
@@ -61,7 +61,7 @@ public class GenConfigForm {
        private String fieldType;

        @Schema(description = "字段描述")
-        private String comment;
+        private String fieldComment;

        @Schema(description = "是否在列表显示")
        private Integer isShowInList;
--- a/src/main/java/com/youlai/system/model/vo/TableColumnVO.java
+++ b/src/main/java/com/youlai/system/model/vo/TableColumnVO.java
@@ -1,34 +0,0 @@
-package com.youlai.system.model.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "数据表字段VO")
-@Data
-public class TableColumnVO {
-
-        @Schema(description = "字段名称", example = "id")
-        private String columnName;
-
-        @Schema(description = "字段类型", example = "bigint")
-        private String dataType;
-
-        @Schema(description = "字段描述", example = "主键")
-        private String columnComment;
-
-        @Schema(description = "字段长度", example = "20")
-        private Integer characterMaximumLength;
-
-        @Schema(description = "是否主键(1-是 0-否)", example = "1")
-        private Integer isPrimaryKey;
-
-        @Schema(description = "是否可为空(1-是 0-否)", example = "1")
-        private String isNullable;
-
-        @Schema(description = "字符集", example = "utf8mb4")
-        private String characterSetName;
-
-        @Schema(description = "字符集排序规则", example = "utf8mb4_general_ci")
-        private String collationName;
-
-}
--- a/src/main/java/com/youlai/system/model/vo/TablePageVO.java
+++ b/src/main/java/com/youlai/system/model/vo/TablePageVO.java
@@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;


-@Schema(description = "数据表VO")
+@Schema(description = "表视图对象")
@Data
 public class TablePageVO {

--- a/src/main/java/com/youlai/system/plugin/syslog/aspect/LogAspect.java
+++ b/src/main/java/com/youlai/system/plugin/syslog/aspect/LogAspect.java
@@ -3,12 +3,10 @@ package com.youlai.system.plugin.syslog.aspect;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.TimeInterval;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.useragent.Browser;
-import cn.hutool.http.useragent.OS;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
 import com.youlai.system.common.constant.SecurityConstants;
-import com.youlai.system.common.util.IPUtils;
+import com.youlai.system.util.IPUtils;
 import com.youlai.system.model.entity.SysLog;
 import com.youlai.system.plugin.syslog.annotation.LogAnnotation;
 import com.youlai.system.security.util.SecurityUtils;
--- a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java
+++ b/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java
@@ -1,7 +1,7 @@
 package com.youlai.system.security.exception;

 import com.youlai.system.common.result.ResultCode;
-import com.youlai.system.common.util.ResponseUtils;
+import com.youlai.system.util.ResponseUtils;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.stereotype.Component;
--- a/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java
+++ b/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java
@@ -1,7 +1,7 @@
 package com.youlai.system.security.exception;

 import com.youlai.system.common.result.ResultCode;
-import com.youlai.system.common.util.ResponseUtils;
+import com.youlai.system.util.ResponseUtils;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
--- a/src/main/java/com/youlai/system/service/GenConfigService.java
+++ b/src/main/java/com/youlai/system/service/GenConfigService.java
@@ -1,15 +1,7 @@
 package com.youlai.system.service;

-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.youlai.system.model.entity.GenConfig;
-import com.youlai.system.model.form.GenConfigForm;
-import com.youlai.system.model.query.TablePageQuery;
-import com.youlai.system.model.vo.GeneratorPreviewVO;
-import com.youlai.system.model.vo.TableColumnVO;
-import com.youlai.system.model.vo.TablePageVO;
-
-import java.util.List;

 /**
 * 代码生成配置接口
--- a/src/main/java/com/youlai/system/service/GeneratorService.java
+++ b/src/main/java/com/youlai/system/service/GeneratorService.java
@@ -1,11 +1,9 @@
 package com.youlai.system.service;

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.model.bo.TableMetaData;
 import com.youlai.system.model.form.GenConfigForm;
 import com.youlai.system.model.query.TablePageQuery;
 import com.youlai.system.model.vo.GeneratorPreviewVO;
-import com.youlai.system.model.vo.TableColumnVO;
 import com.youlai.system.model.vo.TablePageVO;

 import java.util.List;
@@ -24,7 +22,7 @@ public interface GeneratorService {
     * @param queryParams 查询参数
     * @return
     */
-    Page<TableMetaData> getTablePage(TablePageQuery queryParams);
+    Page<TablePageVO> getTablePage(TablePageQuery queryParams);

    /**
     * 获取预览生成代码
@@ -40,7 +38,7 @@ public interface GeneratorService {
     * @param tableName 表名
     * @return
     */
-    GenConfigForm getGenConfig(String tableName);
+    GenConfigForm getGenConfigFormData(String tableName);

    /**
     * 保存代码生成配置
--- a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java
@@ -15,18 +15,22 @@ import com.youlai.system.SystemApplication;
 import com.youlai.system.config.property.GeneratorProperties;
 import com.youlai.system.converter.GenConfigConverter;
 import com.youlai.system.enums.FormTypeEnum;
+import com.youlai.system.enums.JavaTypeEnum;
 import com.youlai.system.enums.QueryTypeEnum;
 import com.youlai.system.exception.BusinessException;
 import com.youlai.system.mapper.DatabaseMapper;
+import com.youlai.system.model.bo.ColumnMetaData;
+import com.youlai.system.model.bo.TableMetaData;
+import com.youlai.system.model.entity.GenConfig;
 import com.youlai.system.model.entity.GenFieldConfig;
 import com.youlai.system.model.form.GenConfigForm;
 import com.youlai.system.model.query.TablePageQuery;
+import com.youlai.system.model.vo.GeneratorPreviewVO;
+import com.youlai.system.model.vo.TablePageVO;
 import com.youlai.system.service.GeneratorService;
 import com.youlai.system.service.GenConfigService;
 import com.youlai.system.service.GenFieldConfigService;
 import lombok.RequiredArgsConstructor;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

 import java.io.File;
@@ -42,14 +46,10 @@ import java.util.*;
@RequiredArgsConstructor
 public class GeneratorServiceImpl implements GeneratorService {

-    @Value("${spring.application.name}")
-    private String applicationName;
-
    private final DatabaseMapper databaseMapper;
    private final GeneratorProperties generatorProperties;
    private final GenConfigService genConfigService;
    private final GenFieldConfigService genFieldConfigService;
-
    private final GenConfigConverter genConfigConverter;

    /**
@@ -58,8 +58,8 @@ public class GeneratorServiceImpl implements GeneratorService {
     * @param queryParams 查询参数
     * @return 分页结果
     */
-    public Page<TableMetaData> getTablePage(TablePageQuery queryParams) {
-        Page<TableMetaData> page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize());
+    public Page<TablePageVO> getTablePage(TablePageQuery queryParams) {
+        Page<TablePageVO> page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize());
        return databaseMapper.getTablePage(page, queryParams);
    }

@@ -70,7 +70,7 @@ public class GeneratorServiceImpl implements GeneratorService {
     * @return 代码生成配置
     */
    @Override
-    public GenConfigForm getGenConfig(String tableName) {
+    public GenConfigForm getGenConfigFormData(String tableName) {
        // 查询表生成配置
        GenConfig genConfig = genConfigService.getOne(
                new LambdaQueryWrapper<>(GenConfig.class)
@@ -96,6 +96,8 @@ public class GeneratorServiceImpl implements GeneratorService {
            String packageName = SystemApplication.class.getPackageName();
            genConfig.setPackageName(packageName);

+            genConfig.setAuthor(generatorProperties.getDefaultConfig().getAuthor());
+
        }

        // 根据表的列 + 已经存在的字段生成配置 得到 组合后的字段生成配置
@@ -114,19 +116,15 @@ public class GeneratorServiceImpl implements GeneratorService {
                String columnName = tableColumn.getColumnName();
                GenFieldConfig genFieldConfig = fieldConfigList.stream()
                        .filter(item -> StrUtil.equals(item.getColumnName(), columnName))
-                        .findFirst().orElseGet(() -> {
-                            GenFieldConfig fieldConfig = new GenFieldConfig();
-                            fieldConfig.setColumnName(tableColumn.getColumnName());
-                            fieldConfig.setColumnType(tableColumn.getDataType());
-                            fieldConfig.setComment(tableColumn.getColumnComment());
-                            fieldConfig.setFieldName(StrUtil.toCamelCase(columnName));
-                            fieldConfig.setFieldType(StrUtil.toCamelCase(tableColumn.getDataType()));
-                            fieldConfig.setIsRequired("YES".equals(tableColumn.getIsNullable()) ? 1 : 0);
-                            fieldConfig.setFormType(FormTypeEnum.INPUT);
-                            fieldConfig.setQueryType(QueryTypeEnum.EQ);
-                            return fieldConfig;
+                        .findFirst()
+                        .orElseGet(() -> createDefaultFieldConfig(tableColumn));

-                        });
+                // 根据列类型设置字段类型
+                String fieldType = genFieldConfig.getFieldType();
+                if (StrUtil.isBlank(fieldType)) {
+                    String javaType = JavaTypeEnum.getJavaTypeByDbType(genFieldConfig.getColumnType());
+                    genFieldConfig.setFieldType(javaType);
+                }
                genFieldConfigs.add(genFieldConfig);
            }
        }
@@ -135,6 +133,24 @@ public class GeneratorServiceImpl implements GeneratorService {
    }


+    /**
+     * 创建默认字段配置
+     *
+     * @param tableColumn 表字段元数据
+     * @return
+     */
+    private GenFieldConfig createDefaultFieldConfig(ColumnMetaData tableColumn) {
+        GenFieldConfig fieldConfig = new GenFieldConfig();
+        fieldConfig.setColumnName(tableColumn.getColumnName());
+        fieldConfig.setColumnType(tableColumn.getDataType());
+        fieldConfig.setFieldComment(tableColumn.getColumnComment());
+        fieldConfig.setFieldName(StrUtil.toCamelCase(tableColumn.getColumnName()));
+        fieldConfig.setIsRequired("YES".equals(tableColumn.getIsNullable()) ? 1 : 0);
+        fieldConfig.setFormType(FormTypeEnum.INPUT);
+        fieldConfig.setQueryType(QueryTypeEnum.EQ);
+        return fieldConfig;
+    }
+
    /**
     * 保存代码生成配置
     *
@@ -204,7 +220,7 @@ public class GeneratorServiceImpl implements GeneratorService {
            // controller
            String subPackageName = templateConfig.getPackageName();
            // 文件路径 com.youlai.system.controller
-            String filePath = getFilePath(templateName, packageName, subPackageName);
+            String filePath = getFilePath(templateName, packageName, subPackageName,entityName);
            previewVO.setPath(filePath);

            /* 3. 生成文件内容 */
@@ -227,32 +243,48 @@ public class GeneratorServiceImpl implements GeneratorService {
        if ("MapperXml".equals(templateName)) {
            return entityName + "Mapper" + extension;
        }
-        if ("API".equals(templateName) || "VIEW".equals(templateName)) {
+        if ("API".equals(templateName)) {
            return StrUtil.toSymbolCase(entityName, '-') + extension;
        }
+
+        if ("VIEW".equals(templateName)) {
+            return "index.vue";
+        }
+
        return entityName + templateName + extension;
    }

-    private String getFilePath(String templateName, String packageName, String subPackageName) {
+    private String getFilePath(String templateName, String packageName, String subPackageName,String entityName) {
        String path;
        if ("MapperXml".equals(templateName)) {
-            path = (applicationName
+            path = (generatorProperties.getBackendAppName()
                    + File.separator
                    + "src" + File.separator + "main" + File.separator + "resources"
                    + File.separator + subPackageName
-            ).replace(".", File.separator);
-        } else if ("API".equals(templateName) || "VIEW".equals(templateName)) {
-            path = ("vue3-element-admin"
+            );
+        } else if ("API".equals(templateName)  ) {
+            path = (generatorProperties.getFrontendAppName()
                    + File.separator
                    + "src" + File.separator + subPackageName
-            ).replace(".", File.separator);
-        } else {
-            path = (applicationName
+            );
+        } else if("VIEW".equals(templateName)){
+            path = (generatorProperties.getFrontendAppName()
+                    + File.separator
+                    + "src" + File.separator + subPackageName
+                    + File.separator
+                    + StrUtil.toSymbolCase(entityName, '-')
+            );
+        }else {
+            path = (generatorProperties.getBackendAppName()
                    + File.separator
                    + "src" + File.separator + "main" + File.separator + "java"
                    + File.separator + packageName + File.separator + subPackageName
-            ).replace(".", File.separator);
+            );
        }
+
+        // subPackageName = model.entity => model/entity
+        path = path.replace(".", File.separator);
+
        return path;
    }

@@ -277,13 +309,14 @@ public class GeneratorServiceImpl implements GeneratorService {
        bindMap.put("tableName", genConfig.getTableName());
        bindMap.put("author", genConfig.getAuthor());
        bindMap.put("lowerFirstEntityName", StrUtil.lowerFirst(entityName));
-        bindMap.put("tableComment", genConfig.getBusinessName());
+        bindMap.put("businessName", genConfig.getBusinessName());
        bindMap.put("fieldConfigs", fieldConfigs);

        for (GenFieldConfig fieldConfig : fieldConfigs) {
            bindMap.put("hasLocalDateTime", "LocalDateTime".equals(fieldConfig.getFieldType()));
            bindMap.put("hasBigDecimal", "BigDecimal".equals(fieldConfig.getFieldType()));
            bindMap.put("hasRequiredField", ObjectUtil.equals(fieldConfig.getIsRequired(), 1));
+            fieldConfig.setTsType(JavaTypeEnum.getTsTypeByJavaType(fieldConfig.getFieldType()));
        }

        TemplateEngine templateEngine = TemplateUtil.createEngine(new TemplateConfig("templates", TemplateConfig.ResourceMode.CLASSPATH));
--- a/src/main/java/com/youlai/system/service/impl/SysLogServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysLogServiceImpl.java
@@ -2,7 +2,7 @@ package com.youlai.system.service.impl;

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.system.common.util.DateUtils;
+import com.youlai.system.util.DateUtils;
 import com.youlai.system.model.bo.VisitCount;
 import com.youlai.system.model.entity.SysLog;
 import com.youlai.system.model.query.LogPageQuery;
--- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.system.common.constant.SystemConstants;
-import com.youlai.system.common.util.DateUtils;
+import com.youlai.system.util.DateUtils;
 import com.youlai.system.converter.UserConverter;
 import com.youlai.system.security.util.SecurityUtils;
 import com.youlai.system.mapper.SysUserMapper;
--- a/src/main/java/com/youlai/system/common/util/DateUtils.java
+++ b/src/main/java/com/youlai/system/common/util/DateUtils.java
@@ -1,5 +1,5 @@

-package com.youlai.system.common.util;
+package com.youlai.system.util;

 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
--- a/src/main/java/com/youlai/system/common/util/ExcelUtils.java
+++ b/src/main/java/com/youlai/system/common/util/ExcelUtils.java
@@ -1,4 +1,4 @@
-package com.youlai.system.common.util;
+package com.youlai.system.util;

 import com.alibaba.excel.EasyExcel;
 import com.youlai.system.plugin.easyexcel.MyAnalysisEventListener;
--- a/src/main/java/com/youlai/system/common/util/IPUtils.java
+++ b/src/main/java/com/youlai/system/common/util/IPUtils.java
@@ -1,4 +1,4 @@
-package com.youlai.system.common.util;
+package com.youlai.system.util;

 import cn.hutool.core.util.StrUtil;
 import jakarta.annotation.PostConstruct;
--- a/src/main/java/com/youlai/system/common/util/ResponseUtils.java
+++ b/src/main/java/com/youlai/system/common/util/ResponseUtils.java
@@ -1,4 +1,4 @@
-package com.youlai.system.common.util;
+package com.youlai.system.util;

 import cn.hutool.json.JSONUtil;
 import com.youlai.system.common.result.Result;