feat: 更新代码生成功能-一阶段

ruoyi-admin/src/main/resources/application-dev.yml

@@ -16,9 +16,9 @@ spring:
         master:
           type: ${spring.datasource.type}
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://127.0.0.1:3306/ruoyi-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://47.112.190.27:3306/ruoyi-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: ruoyi-ai
-          password: ruoyi-ai
+          password: Hp3fMaFNWrTijiZH
 
       hikari:
         # 最大连接池数量

ruoyi-admin/src/main/resources/application.yml

@@ -133,6 +133,10 @@ security:
     - /chat/send
     # 文件上传
     - /chat/upload
+    # 数据模型分组选择接口
+    - /dev/schemaGroup/select
+    # 代码生成调用
+    - /dev/schemaField/getByTableName
     # 静态资源
     - /*.html
     - /**/*.html
@@ -185,7 +189,7 @@ mybatis-plus:
     # 更详细的日志输出 会有性能损耗 org.apache.ibatis.logging.stdout.StdOutImpl
     # 关闭日志记录 (可单纯使用 p6spy 分析) org.apache.ibatis.logging.nologging.NoLoggingImpl
     # 默认日志输出 org.apache.ibatis.logging.slf4j.Slf4jImpl
-    logImpl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl
   global-config:
     # 是否打印 Logo banner
     banner: true

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/config/GenConfig.java

@@ -53,19 +53,11 @@ public class GenConfig {
         GenConfig.packageName = packageName;
     }
 
-    public static boolean getAutoRemovePre() {
-        return autoRemovePre;
-    }
-
     @Value("${autoRemovePre}")
     public void setAutoRemovePre(boolean autoRemovePre) {
         GenConfig.autoRemovePre = autoRemovePre;
     }
 
-    public static String getTablePrefix() {
-        return tablePrefix;
-    }
-
     @Value("${tablePrefix}")
     public void setTablePrefix(String tablePrefix) {
         GenConfig.tablePrefix = tablePrefix;

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/constant/GenConstants.java

@@ -36,73 +36,12 @@ public interface GenConstants {
      */
     String PARENT_MENU_ID = "parentMenuId";
 
-    /**
-     * 上级菜单名称字段
-     */
-    String PARENT_MENU_NAME = "parentMenuName";
-
-    /**
-     * 数据库字符串类型
-     */
-    String[] COLUMNTYPE_STR = {"char", "varchar", "enum", "set", "nchar", "nvarchar", "varchar2", "nvarchar2"};
-
-    /**
-     * 数据库文本类型
-     */
-    String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext", "binary", "varbinary", "blob",
-        "ntext", "image", "bytea"};
-
-    /**
-     * 数据库时间类型
-     */
-    String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp", "year", "interval",
-        "smalldatetime", "datetime2", "datetimeoffset"};
-
-    /**
-     * 数据库数字类型
-     */
-    String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
-        "bit", "bigint", "float", "double", "decimal", "numeric", "real", "double precision",
-        "smallserial", "serial", "bigserial", "money", "smallmoney"};
-
-    /**
-     * BO对象 不需要添加字段
-     */
-    String[] COLUMNNAME_NOT_ADD = {"create_dept", "create_by", "create_time", "del_flag", "update_by",
-        "update_time", "version", "tenant_id"};
-
-    /**
-     * BO对象 不需要编辑字段
-     */
-    String[] COLUMNNAME_NOT_EDIT = {"create_dept", "create_by", "create_time", "del_flag", "update_by",
-        "update_time", "version", "tenant_id"};
-
-    /**
-     * VO对象 不需要返回字段
-     */
-    String[] COLUMNNAME_NOT_LIST = {"create_dept", "create_by", "create_time", "del_flag", "update_by",
-        "update_time", "version", "tenant_id"};
-
-    /**
-     * BO对象 不需要查询字段
-     */
-    String[] COLUMNNAME_NOT_QUERY = {"id", "create_dept", "create_by", "create_time", "del_flag", "update_by",
-        "update_time", "remark", "version", "tenant_id"};
 
     /**
      * Entity基类字段
      */
     String[] BASE_ENTITY = {"createDept", "createBy", "createTime", "updateBy", "updateTime", "tenantId"};
 
-    /**
-     * 文本框
-     */
-    String HTML_INPUT = "input";
-
-    /**
-     * 文本域
-     */
-    String HTML_TEXTAREA = "textarea";
 
     /**
      * 下拉框
@@ -119,46 +58,6 @@ public interface GenConstants {
      */
     String HTML_CHECKBOX = "checkbox";
 
-    /**
-     * 日期控件
-     */
-    String HTML_DATETIME = "datetime";
-
-    /**
-     * 图片上传控件
-     */
-    String HTML_IMAGE_UPLOAD = "imageUpload";
-
-    /**
-     * 文件上传控件
-     */
-    String HTML_FILE_UPLOAD = "fileUpload";
-
-    /**
-     * 富文本控件
-     */
-    String HTML_EDITOR = "editor";
-
-    /**
-     * 字符串类型
-     */
-    String TYPE_STRING = "String";
-
-    /**
-     * 整型
-     */
-    String TYPE_INTEGER = "Integer";
-
-    /**
-     * 长整型
-     */
-    String TYPE_LONG = "Long";
-
-    /**
-     * 浮点型
-     */
-    String TYPE_DOUBLE = "Double";
-
     /**
      * 高精度计算类型
      */
@@ -168,19 +67,4 @@ public interface GenConstants {
      * 时间类型
      */
     String TYPE_DATE = "Date";
-
-    /**
-     * 模糊查询
-     */
-    String QUERY_LIKE = "LIKE";
-
-    /**
-     * 相等查询
-     */
-    String QUERY_EQ = "EQ";
-
-    /**
-     * 需要
-     */
-    String REQUIRE = "1";
 }

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/controller/GenController.java

@@ -9,19 +9,14 @@ import org.ruoyi.common.core.domain.R;
 import org.ruoyi.common.log.annotation.Log;
 import org.ruoyi.common.log.enums.BusinessType;
 import org.ruoyi.common.web.core.BaseController;
-import org.ruoyi.core.page.PageQuery;
-import org.ruoyi.core.page.TableDataInfo;
-import org.ruoyi.generator.domain.GenTable;
-import org.ruoyi.generator.domain.GenTableColumn;
 import org.ruoyi.generator.service.IGenTableService;
 import org.ruoyi.helper.DataBaseHelper;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 代码生成 操作处理
@@ -36,150 +31,6 @@ public class GenController extends BaseController {
 
     private final IGenTableService genTableService;
 
-    /**
-     * 查询代码生成列表
-     */
-    @SaCheckPermission("tool:gen:list")
-    @GetMapping("/list")
-    public TableDataInfo<GenTable> genList(GenTable genTable, PageQuery pageQuery) {
-
-        return genTableService.selectPageGenTableList(genTable, pageQuery);
-    }
-
-    /**
-     * 修改代码生成业务
-     *
-     * @param tableId 表ID
-     */
-    @SaCheckPermission("tool:gen:query")
-    @GetMapping(value = "/{tableId}")
-    public R<Map<String, Object>> getInfo(@PathVariable Long tableId) {
-        GenTable table = genTableService.selectGenTableById(tableId);
-        List<GenTable> tables = genTableService.selectGenTableAll();
-        List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId);
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("info", table);
-        map.put("rows", list);
-        map.put("tables", tables);
-        return R.ok(map);
-    }
-
-    /**
-     * 查询数据库列表
-     */
-    @SaCheckPermission("tool:gen:list")
-    @GetMapping("/db/list")
-    public TableDataInfo<GenTable> dataList(GenTable genTable, PageQuery pageQuery) {
-        return genTableService.selectPageDbTableList(genTable, pageQuery);
-    }
-
-    /**
-     * 查询数据表字段列表
-     *
-     * @param tableId 表ID
-     */
-    @SaCheckPermission("tool:gen:list")
-    @GetMapping(value = "/column/{tableId}")
-    public TableDataInfo<GenTableColumn> columnList(Long tableId) {
-        TableDataInfo<GenTableColumn> dataInfo = new TableDataInfo<>();
-        List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId);
-        dataInfo.setRows(list);
-        dataInfo.setTotal(list.size());
-        return dataInfo;
-    }
-
-    /**
-     * 导入表结构（保存）
-     *
-     * @param tables 表名串
-     */
-    @SaCheckPermission("tool:gen:import")
-    @Log(title = "代码生成", businessType = BusinessType.IMPORT)
-    @PostMapping("/importTable")
-    public R<Void> importTableSave(String tables) {
-        String[] tableNames = Convert.toStrArray(tables);
-        // 查询表信息
-        List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
-        genTableService.importGenTable(tableList);
-        return R.ok();
-    }
-
-    /**
-     * 修改保存代码生成业务
-     */
-    @SaCheckPermission("tool:gen:edit")
-    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public R<Void> editSave(@Validated @RequestBody GenTable genTable) {
-        genTableService.validateEdit(genTable);
-        genTableService.updateGenTable(genTable);
-        return R.ok();
-    }
-
-    /**
-     * 删除代码生成
-     *
-     * @param tableIds 表ID串
-     */
-    @SaCheckPermission("tool:gen:remove")
-    @Log(title = "代码生成", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{tableIds}")
-    public R<Void> remove(@PathVariable Long[] tableIds) {
-        genTableService.deleteGenTableByIds(tableIds);
-        return R.ok();
-    }
-
-    /**
-     * 预览代码
-     *
-     * @param tableId 表ID
-     */
-    @SaCheckPermission("tool:gen:preview")
-    @GetMapping("/preview/{tableId}")
-    public R<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
-        Map<String, String> dataMap = genTableService.previewCode(tableId);
-        return R.ok(dataMap);
-    }
-
-    /**
-     * 生成代码（下载方式）
-     *
-     * @param tableId 表名
-     */
-    @SaCheckPermission("tool:gen:code")
-    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
-    @GetMapping("/download/{tableId}")
-    public void download(HttpServletResponse response, @PathVariable("tableId") Long tableId) throws IOException {
-        byte[] data = genTableService.downloadCode(tableId);
-        genCode(response, data);
-    }
-
-    /**
-     * 生成代码（自定义路径）
-     *
-     * @param tableName 表名
-     */
-    @SaCheckPermission("tool:gen:code")
-    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
-    @GetMapping("/genCode/{tableName}")
-    public R<Void> genCode(@PathVariable("tableName") String tableName) {
-        genTableService.generatorCode(tableName);
-        return R.ok();
-    }
-
-    /**
-     * 同步数据库
-     *
-     * @param tableName 表名
-     */
-    @SaCheckPermission("tool:gen:edit")
-    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
-    @GetMapping("/synchDb/{tableName}")
-    public R<Void> synchDb(@PathVariable("tableName") String tableName) {
-        genTableService.synchDb(tableName);
-        return R.ok();
-    }
-
     /**
      * 批量生成代码
      *
@@ -213,7 +64,7 @@ public class GenController extends BaseController {
      */
     @SaCheckPermission("tool:gen:list")
     @GetMapping(value = "/getDataNames")
-    public R<Object> getCurrentDataSourceNameList(){
+    public R<Object> getCurrentDataSourceNameList() {
         return R.ok(DataBaseHelper.getDataSourceNameList());
     }
 }

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/controller/SchemaController.java

@@ -0,0 +1,99 @@
+package org.ruoyi.generator.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.generator.domain.bo.SchemaBo;
+import org.ruoyi.generator.domain.vo.SchemaVo;
+import org.ruoyi.generator.service.ISchemaService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 数据模型
+ *
+ * @author ruoyi
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/dev/schema")
+public class SchemaController extends BaseController {
+
+    private final ISchemaService schemaService;
+
+    /**
+     * 查询数据模型列表
+     */
+    @SaCheckPermission("dev:schema:list")
+    @GetMapping("/list")
+    public TableDataInfo<SchemaVo> list(SchemaBo bo, PageQuery pageQuery) {
+        return schemaService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取数据模型详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("dev:schema:query")
+    @GetMapping("/{id}")
+    public R<SchemaVo> getInfo(@NotNull(message = "主键不能为空")
+                               @PathVariable Long id) {
+        return R.ok(schemaService.queryById(id));
+    }
+
+    /**
+     * 新增数据模型
+     */
+    @SaCheckPermission("dev:schema:add")
+    @Log(title = "数据模型", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SchemaBo bo) {
+        return toAjax(schemaService.insertByBo(bo));
+    }
+
+    /**
+     * 修改数据模型
+     */
+    @SaCheckPermission("dev:schema:edit")
+    @Log(title = "数据模型", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SchemaBo bo) {
+        return toAjax(schemaService.updateByBo(bo));
+    }
+
+    /**
+     * 删除数据模型
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("dev:schema:remove")
+    @Log(title = "数据模型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(schemaService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/controller/SchemaFieldController.java

@@ -0,0 +1,134 @@
+package org.ruoyi.generator.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.generator.domain.bo.SchemaFieldBo;
+import org.ruoyi.generator.domain.vo.SchemaFieldVo;
+import org.ruoyi.generator.service.ISchemaFieldService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 数据模型字段
+ *
+ * @author ruoyi
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/dev/schemaField")
+public class SchemaFieldController extends BaseController {
+
+    private final ISchemaFieldService schemaFieldService;
+
+    /**
+     * 查询数据模型字段列表
+     */
+    @SaCheckPermission("dev:schemaField:list")
+    @GetMapping("/list")
+    public TableDataInfo<SchemaFieldVo> list(SchemaFieldBo bo, PageQuery pageQuery) {
+        return schemaFieldService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取数据模型字段详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("dev:schemaField:query")
+    @GetMapping("/{id}")
+    public R<SchemaFieldVo> getInfo(@NotNull(message = "主键不能为空")
+                                    @PathVariable Long id) {
+        return R.ok(schemaFieldService.queryById(id));
+    }
+
+    /**
+     * 新增数据模型字段
+     */
+    @SaCheckPermission("dev:schemaField:add")
+    @Log(title = "数据模型字段", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SchemaFieldBo bo) {
+        return toAjax(schemaFieldService.insertByBo(bo));
+    }
+
+    /**
+     * 修改数据模型字段
+     */
+    @SaCheckPermission("dev:schemaField:edit")
+    @Log(title = "数据模型字段", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SchemaFieldBo bo) {
+        return toAjax(schemaFieldService.updateByBo(bo));
+    }
+
+    /**
+     * 删除数据模型字段
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("dev:schemaField:remove")
+    @Log(title = "数据模型字段", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(schemaFieldService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 批量更新字段配置
+     *
+     * @param fields 字段配置列表
+     */
+    @SaCheckPermission("dev:schemaField:edit")
+    @Log(title = "批量更新字段配置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/batchUpdate")
+    public R<Void> batchUpdateFieldConfig(@Validated(EditGroup.class) @RequestBody List<SchemaFieldBo> fields) {
+        return toAjax(schemaFieldService.batchUpdateFieldConfig(fields));
+    }
+
+    /**
+     * 根据模型ID查询字段列表
+     *
+     * @param schemaId 模型ID
+     */
+    @SaCheckPermission("dev:schemaField:list")
+    @GetMapping("/listBySchemaId/{schemaId}")
+    public R<List<SchemaFieldVo>> listBySchemaId(@NotNull(message = "模型ID不能为空")
+                                                 @PathVariable Long schemaId) {
+        return R.ok(schemaFieldService.queryListBySchemaId(schemaId));
+    }
+
+    /**
+     * 根据表名获取代码生成元数据
+     *
+     * @param tableName 表名
+     */
+    @GetMapping("/getByTableName")
+    public R<Object> getByTableName(@NotNull(message = "表名不能为空") String tableName) {
+        return R.ok(schemaFieldService.getMetaDataByTableName(tableName));
+    }
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/controller/SchemaGroupController.java

@@ -0,0 +1,108 @@
+package org.ruoyi.generator.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.domain.R;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.common.idempotent.annotation.RepeatSubmit;
+import org.ruoyi.common.log.annotation.Log;
+import org.ruoyi.common.log.enums.BusinessType;
+import org.ruoyi.common.web.core.BaseController;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.generator.domain.bo.SchemaGroupBo;
+import org.ruoyi.generator.domain.vo.SchemaGroupVo;
+import org.ruoyi.generator.service.ISchemaGroupService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 数据模型分组
+ *
+ * @author ruoyi
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/dev/schemaGroup")
+public class SchemaGroupController extends BaseController {
+
+    private final ISchemaGroupService schemaGroupService;
+
+    /**
+     * 查询数据模型分组列表
+     */
+    @SaCheckPermission("dev:schemaGroup:list")
+    @GetMapping("/list")
+    public TableDataInfo<SchemaGroupVo> list(SchemaGroupBo bo, PageQuery pageQuery) {
+        return schemaGroupService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取数据模型分组选择列表
+     */
+    @GetMapping("/select")
+    public R<List<SchemaGroupVo>> select() {
+        SchemaGroupBo bo = new SchemaGroupBo();
+        List<SchemaGroupVo> list = schemaGroupService.queryList(bo);
+        return R.ok(list);
+    }
+
+    /**
+     * 获取数据模型分组详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("dev:schemaGroup:query")
+    @GetMapping("/{id}")
+    public R<SchemaGroupVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return R.ok(schemaGroupService.queryById(id));
+    }
+
+    /**
+     * 新增数据模型分组
+     */
+    @SaCheckPermission("dev:schemaGroup:add")
+    @Log(title = "数据模型分组", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SchemaGroupBo bo) {
+        return toAjax(schemaGroupService.insertByBo(bo));
+    }
+
+    /**
+     * 修改数据模型分组
+     */
+    @SaCheckPermission("dev:schemaGroup:edit")
+    @Log(title = "数据模型分组", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SchemaGroupBo bo) {
+        return toAjax(schemaGroupService.updateByBo(bo));
+    }
+
+    /**
+     * 删除数据模型分组
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("dev:schemaGroup:remove")
+    @Log(title = "数据模型分组", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+        return toAjax(schemaGroupService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/domain/GenTable.java

@@ -8,9 +8,7 @@ import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.ruoyi.common.core.utils.StringUtils;
 import org.ruoyi.core.domain.BaseEntity;
-import org.ruoyi.generator.constant.GenConstants;
 
 import java.util.List;
 
@@ -164,27 +162,4 @@ public class GenTable extends BaseEntity {
     @TableField(exist = false)
     private String parentMenuName;
 
-    public boolean isTree() {
-        return isTree(this.tplCategory);
-    }
-
-    public static boolean isTree(String tplCategory) {
-        return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
-    }
-
-    public boolean isCrud() {
-        return isCrud(this.tplCategory);
-    }
-
-    public static boolean isCrud(String tplCategory) {
-        return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
-    }
-
-    public boolean isSuperColumn(String javaField) {
-        return isSuperColumn(this.tplCategory, javaField);
-    }
-
-    public static boolean isSuperColumn(String tplCategory, String javaField) {
-        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
-    }
 }

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/domain/Schema.java

@@ -0,0 +1,103 @@
+package org.ruoyi.generator.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 数据模型对象 dev_schema
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("dev_schema")
+public class Schema extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 分组ID
+     */
+    private Long schemaGroupId;
+
+    /**
+     * 模型名称
+     */
+    private String name;
+
+    /**
+     * 模型编码
+     */
+    private String code;
+
+    /**
+     * 表名
+     */
+    private String tableName;
+
+    /**
+     * 表注释
+     */
+    private String comment;
+
+    /**
+     * 存储引擎
+     */
+    private String engine;
+
+    /**
+     * 列表字段
+     */
+    private String listKeys;
+
+    /**
+     * 搜索表单字段
+     */
+    private String searchFormKeys;
+
+    /**
+     * 表单设计
+     */
+    private String designer;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/domain/SchemaField.java

@@ -0,0 +1,153 @@
+package org.ruoyi.generator.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 数据模型字段对象 dev_schema_field
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("dev_schema_field")
+public class SchemaField extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 模型ID
+     */
+    private Long schemaId;
+
+    /**
+     * 字段名称
+     */
+    private String name;
+
+    /**
+     * 字段编码
+     */
+    private String code;
+
+    /**
+     * 字段类型
+     */
+    private String type;
+
+    /**
+     * 字段注释
+     */
+    private String comment;
+
+    /**
+     * 是否主键
+     */
+    private String isPk;
+
+    /**
+     * 是否必填
+     */
+    private String isRequired;
+
+    /**
+     * 是否唯一
+     */
+    private String isUnique;
+
+    /**
+     * 默认值
+     */
+    private String defaultValue;
+
+    /**
+     * 字段长度
+     */
+    private Integer length;
+
+    /**
+     * 小数位数
+     */
+    private Integer scale;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 是否列表显示（0否 1是）
+     */
+    private String isList;
+
+    /**
+     * 是否查询字段（0否 1是）
+     */
+    private String isQuery;
+
+    /**
+     * 是否插入字段（0否 1是）
+     */
+    private String isInsert;
+
+    /**
+     * 是否编辑字段（0否 1是）
+     */
+    private String isEdit;
+
+    /**
+     * 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围）
+     */
+    private String queryType;
+
+    /**
+     * 显示类型（input输入框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传、upload文件上传、editor富文本编辑器）
+     */
+    private String htmlType;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 扩展JSON
+     */
+    private String extendJson;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/domain/SchemaGroup.java

@@ -0,0 +1,73 @@
+package org.ruoyi.generator.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 数据模型分组对象 dev_schema_group
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("dev_schema_group")
+public class SchemaGroup extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 分组名称
+     */
+    private String name;
+
+    /**
+     * 分组编码
+     */
+    private String code;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/domain/bo/SchemaBo.java

@@ -0,0 +1,92 @@
+package org.ruoyi.generator.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.core.domain.BaseEntity;
+import org.ruoyi.generator.domain.Schema;
+
+/**
+ * 数据模型业务对象 SchemaBo
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = Schema.class, reverseConvertGenerate = false)
+public class SchemaBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 分组ID
+     */
+    private Long schemaGroupId;
+
+    /**
+     * 模型名称
+     */
+    @NotBlank(message = "模型名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String name;
+
+    /**
+     * 模型编码
+     */
+    @NotBlank(message = "模型编码不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String code;
+
+    /**
+     * 表名
+     */
+    private String tableName;
+
+    /**
+     * 表注释
+     */
+    private String comment;
+
+    /**
+     * 存储引擎
+     */
+    private String engine;
+
+    /**
+     * 列表字段
+     */
+    private String listKeys;
+
+    /**
+     * 搜索表单字段
+     */
+    private String searchFormKeys;
+
+    /**
+     * 表单设计
+     */
+    private String designer;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/domain/bo/SchemaFieldBo.java

@@ -0,0 +1,143 @@
+package org.ruoyi.generator.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.core.domain.BaseEntity;
+import org.ruoyi.generator.domain.SchemaField;
+
+/**
+ * 数据模型字段业务对象 SchemaFieldBo
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SchemaField.class, reverseConvertGenerate = false)
+public class SchemaFieldBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 模型ID
+     */
+    @NotNull(message = "模型ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long schemaId;
+
+    /**
+     * 字段名称
+     */
+    @NotBlank(message = "字段名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String name;
+
+    /**
+     * 字段编码
+     */
+    @NotBlank(message = "字段编码不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String code;
+
+    /**
+     * 字段类型
+     */
+    private String type;
+
+    /**
+     * 字段注释
+     */
+    private String comment;
+
+    /**
+     * 是否主键
+     */
+    private String isPk;
+
+    /**
+     * 是否必填
+     */
+    private String isRequired;
+
+    /**
+     * 是否唯一
+     */
+    private String isUnique;
+
+    /**
+     * 默认值
+     */
+    private String defaultValue;
+
+    /**
+     * 字段长度
+     */
+    private Integer length;
+
+    /**
+     * 小数位数
+     */
+    private Integer scale;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 是否列表显示（0否 1是）
+     */
+    private String isList;
+
+    /**
+     * 是否查询字段（0否 1是）
+     */
+    private String isQuery;
+
+    /**
+     * 是否插入字段（0否 1是）
+     */
+    private String isInsert;
+
+    /**
+     * 是否编辑字段（0否 1是）
+     */
+    private String isEdit;
+
+    /**
+     * 查询方式
+     */
+    private String queryType;
+
+    /**
+     * 显示类型
+     */
+    private String htmlType;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 扩展JSON
+     */
+    private String extendJson;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/domain/bo/SchemaGroupBo.java

@@ -0,0 +1,62 @@
+package org.ruoyi.generator.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.core.domain.BaseEntity;
+import org.ruoyi.generator.domain.SchemaGroup;
+
+/**
+ * 数据模型分组业务对象 SchemaGroupBo
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SchemaGroup.class, reverseConvertGenerate = false)
+public class SchemaGroupBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 分组名称
+     */
+    @NotBlank(message = "分组名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String name;
+
+    /**
+     * 分组编码
+     */
+    @NotBlank(message = "分组编码不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String code;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/domain/vo/SchemaFieldVo.java

@@ -0,0 +1,155 @@
+package org.ruoyi.generator.domain.vo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.ruoyi.generator.domain.SchemaField;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 数据模型字段视图对象 SchemaFieldVo
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+@Data
+@AutoMapper(target = SchemaField.class)
+public class SchemaFieldVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 模型ID
+     */
+    private Long schemaId;
+
+    /**
+     * 字段名称
+     */
+    private String name;
+
+    /**
+     * 字段编码
+     */
+    private String code;
+
+    /**
+     * 字段类型
+     */
+    private String type;
+
+    /**
+     * 字段注释
+     */
+    private String comment;
+
+    /**
+     * 是否主键
+     */
+    private String isPk;
+
+    /**
+     * 是否必填
+     */
+    private String isRequired;
+
+    /**
+     * 是否唯一
+     */
+    private String isUnique;
+
+    /**
+     * 默认值
+     */
+    private String defaultValue;
+
+    /**
+     * 字段长度
+     */
+    private Integer length;
+
+    /**
+     * 小数位数
+     */
+    private Integer scale;
+
+    /**
+     * 排序
+     */
+    @Schema(description = "排序")
+    private Integer sort;
+
+    /**
+     * 是否列表显示（0否 1是）
+     */
+    @Schema(description = "是否列表显示")
+    private String isList;
+
+    /**
+     * 是否查询字段（0否 1是）
+     */
+    @Schema(description = "是否查询字段")
+    private String isQuery;
+
+    /**
+     * 是否插入字段（0否 1是）
+     */
+    @Schema(description = "是否插入字段")
+    private String isInsert;
+
+    /**
+     * 是否编辑字段（0否 1是）
+     */
+    @Schema(description = "是否编辑字段")
+    private String isEdit;
+
+    /**
+     * 查询方式
+     */
+    @Schema(description = "查询方式")
+    private String queryType;
+
+    /**
+     * 显示类型
+     */
+    @Schema(description = "显示类型")
+    private String htmlType;
+
+    /**
+     * 字典类型
+     */
+    @Schema(description = "字典类型")
+    private String dictType;
+
+    /**
+     * 状态
+     */
+    @Schema(description = "状态")
+    private String status;
+
+    /**
+     * 扩展JSON
+     */
+    private String extendJson;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/domain/vo/SchemaGroupVo.java

@@ -0,0 +1,64 @@
+package org.ruoyi.generator.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.ruoyi.generator.domain.SchemaGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 数据模型分组视图对象 SchemaGroupVo
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+@Data
+@AutoMapper(target = SchemaGroup.class)
+public class SchemaGroupVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 分组名称
+     */
+    private String name;
+
+    /**
+     * 分组编码
+     */
+    private String code;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/domain/vo/SchemaVo.java

@@ -0,0 +1,95 @@
+package org.ruoyi.generator.domain.vo;
+
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.ruoyi.generator.domain.Schema;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 数据模型视图对象 SchemaVo
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+@Data
+@AutoMapper(target = Schema.class)
+public class SchemaVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 分组ID
+     */
+    private Long schemaGroupId;
+
+    /**
+     * 模型名称
+     */
+    private String name;
+
+    /**
+     * 模型编码
+     */
+    private String code;
+
+    /**
+     * 表名
+     */
+    private String tableName;
+
+    /**
+     * 表注释
+     */
+    private String comment;
+
+    /**
+     * 存储引擎
+     */
+    private String engine;
+
+    /**
+     * 列表字段
+     */
+    private String listKeys;
+
+    /**
+     * 搜索表单字段
+     */
+    private String searchFormKeys;
+
+    /**
+     * 表单设计
+     */
+    private String designer;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/mapper/GenTableColumnMapper.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.ruoyi.core.mapper.BaseMapperPlus;
 import org.ruoyi.generator.domain.GenTableColumn;
 
-import java.util.List;
-
 /**
  * 业务字段 数据层
  *
@@ -13,12 +11,5 @@ import java.util.List;
  */
 @InterceptorIgnore(dataPermission = "true", tenantLine = "true")
 public interface GenTableColumnMapper extends BaseMapperPlus<GenTableColumn, GenTableColumn> {
-    /**
-     * 根据表名称查询列信息
-     *
-     * @param tableName 表名称
-     * @return 列信息
-     */
-    List<GenTableColumn> selectDbTableColumnsByName(String tableName);
 
 }

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/mapper/GenTableMapper.java

@@ -1,13 +1,9 @@
 package org.ruoyi.generator.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
 import org.ruoyi.core.mapper.BaseMapperPlus;
 import org.ruoyi.generator.domain.GenTable;
 
-import java.util.List;
-
 /**
  * 业务 数据层
  *
@@ -16,29 +12,6 @@ import java.util.List;
 @InterceptorIgnore(dataPermission = "true", tenantLine = "true")
 public interface GenTableMapper extends BaseMapperPlus<GenTable, GenTable> {
 
-    /**
-     * 查询据库列表
-     *
-     * @param genTable 查询条件
-     * @return 数据库表集合
-     */
-    Page<GenTable> selectPageDbTableList(@Param("page") Page<GenTable> page, @Param("genTable") GenTable genTable);
-
-    /**
-     * 查询据库列表
-     *
-     * @param tableNames 表名称组
-     * @return 数据库表集合
-     */
-    List<GenTable> selectDbTableListByNames(String[] tableNames);
-
-    /**
-     * 查询所有表信息
-     *
-     * @return 表信息集合
-     */
-    List<GenTable> selectGenTableAll();
-
     /**
      * 查询表ID业务信息
      *
@@ -47,12 +20,5 @@ public interface GenTableMapper extends BaseMapperPlus<GenTable, GenTable> {
      */
     GenTable selectGenTableById(Long id);
 
-    /**
-     * 查询表名称业务信息
-     *
-     * @param tableName 表名称
-     * @return 业务信息
-     */
-    GenTable selectGenTableByName(String tableName);
 
 }

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/mapper/SchemaFieldMapper.java

@@ -0,0 +1,16 @@
+package org.ruoyi.generator.mapper;
+
+
+import org.ruoyi.core.mapper.BaseMapperPlus;
+import org.ruoyi.generator.domain.SchemaField;
+import org.ruoyi.generator.domain.vo.SchemaFieldVo;
+
+/**
+ * 数据模型字段Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+public interface SchemaFieldMapper extends BaseMapperPlus<SchemaField, SchemaFieldVo> {
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/mapper/SchemaGroupMapper.java

@@ -0,0 +1,15 @@
+package org.ruoyi.generator.mapper;
+
+import org.ruoyi.core.mapper.BaseMapperPlus;
+import org.ruoyi.generator.domain.SchemaGroup;
+import org.ruoyi.generator.domain.vo.SchemaGroupVo;
+
+/**
+ * 数据模型分组Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+public interface SchemaGroupMapper extends BaseMapperPlus<SchemaGroup, SchemaGroupVo> {
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/mapper/SchemaMapper.java

@@ -0,0 +1,16 @@
+package org.ruoyi.generator.mapper;
+
+
+import org.ruoyi.core.mapper.BaseMapperPlus;
+import org.ruoyi.generator.domain.Schema;
+import org.ruoyi.generator.domain.vo.SchemaVo;
+
+/**
+ * 数据模型Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+public interface SchemaMapper extends BaseMapperPlus<Schema, SchemaVo> {
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/service/GenTableServiceImpl.java

@@ -1,456 +0,0 @@
-package org.ruoyi.generator.service;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Dict;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-import org.ruoyi.common.core.constant.Constants;
-import org.ruoyi.common.core.exception.ServiceException;
-import org.ruoyi.common.core.utils.StreamUtils;
-import org.ruoyi.common.core.utils.StringUtils;
-import org.ruoyi.common.core.utils.file.FileUtils;
-import org.ruoyi.common.json.utils.JsonUtils;
-import org.ruoyi.common.satoken.utils.LoginHelper;
-import org.ruoyi.core.page.PageQuery;
-import org.ruoyi.core.page.TableDataInfo;
-import org.ruoyi.generator.constant.GenConstants;
-import org.ruoyi.generator.domain.GenTable;
-import org.ruoyi.generator.domain.GenTableColumn;
-import org.ruoyi.generator.mapper.GenTableColumnMapper;
-import org.ruoyi.generator.mapper.GenTableMapper;
-import org.ruoyi.generator.util.GenUtils;
-import org.ruoyi.generator.util.VelocityInitializer;
-import org.ruoyi.generator.util.VelocityUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-/**
- * 业务 服务层实现
- *
- * @author Lion Li
- */
-//@DS("#header.datasource")
-@Slf4j
-@RequiredArgsConstructor
-@Service
-public class GenTableServiceImpl implements IGenTableService {
-
-    private final GenTableMapper baseMapper;
-    private final GenTableColumnMapper genTableColumnMapper;
-    private final IdentifierGenerator identifierGenerator;
-
-    /**
-     * 查询业务字段列表
-     *
-     * @param tableId 业务字段编号
-     * @return 业务字段集合
-     */
-    @Override
-    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId) {
-        return genTableColumnMapper.selectList(new LambdaQueryWrapper<GenTableColumn>()
-            .eq(GenTableColumn::getTableId, tableId)
-            .orderByAsc(GenTableColumn::getSort));
-    }
-
-    /**
-     * 查询业务信息
-     *
-     * @param id 业务ID
-     * @return 业务信息
-     */
-    @Override
-    public GenTable selectGenTableById(Long id) {
-        GenTable genTable = baseMapper.selectGenTableById(id);
-        setTableFromOptions(genTable);
-        return genTable;
-    }
-
-    @Override
-    public TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable, PageQuery pageQuery) {
-        Page<GenTable> page = baseMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable));
-        return TableDataInfo.build(page);
-    }
-
-    private QueryWrapper<GenTable> buildGenTableQueryWrapper(GenTable genTable) {
-        Map<String, Object> params = genTable.getParams();
-        QueryWrapper<GenTable> wrapper = Wrappers.query();
-        wrapper.like(StringUtils.isNotBlank(genTable.getTableName()), "lower(table_name)", StringUtils.lowerCase(genTable.getTableName()))
-            .like(StringUtils.isNotBlank(genTable.getTableComment()), "lower(table_comment)", StringUtils.lowerCase(genTable.getTableComment()))
-            .between(params.get("beginTime") != null && params.get("endTime") != null,
-                "create_time", params.get("beginTime"), params.get("endTime"));
-        return wrapper;
-    }
-
-
-    @Override
-    public TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable, PageQuery pageQuery) {
-        Page<GenTable> page = baseMapper.selectPageDbTableList(pageQuery.build(), genTable);
-        return TableDataInfo.build(page);
-    }
-
-    /**
-     * 查询据库列表
-     *
-     * @param tableNames 表名称组
-     * @return 数据库表集合
-     */
-    @Override
-    public List<GenTable> selectDbTableListByNames(String[] tableNames) {
-        return baseMapper.selectDbTableListByNames(tableNames);
-    }
-
-    /**
-     * 查询所有表信息
-     *
-     * @return 表信息集合
-     */
-    @Override
-    public List<GenTable> selectGenTableAll() {
-        return baseMapper.selectGenTableAll();
-    }
-
-    /**
-     * 修改业务
-     *
-     * @param genTable 业务信息
-     * @return 结果
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void updateGenTable(GenTable genTable) {
-        String options = JsonUtils.toJsonString(genTable.getParams());
-        genTable.setOptions(options);
-        int row = baseMapper.updateById(genTable);
-        if (row > 0) {
-            for (GenTableColumn cenTableColumn : genTable.getColumns()) {
-                genTableColumnMapper.updateById(cenTableColumn);
-            }
-        }
-    }
-
-    /**
-     * 删除业务对象
-     *
-     * @param tableIds 需要删除的数据ID
-     * @return 结果
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void deleteGenTableByIds(Long[] tableIds) {
-        List<Long> ids = Arrays.asList(tableIds);
-        baseMapper.deleteBatchIds(ids);
-        genTableColumnMapper.delete(new LambdaQueryWrapper<GenTableColumn>().in(GenTableColumn::getTableId, ids));
-    }
-
-    /**
-     * 导入表结构
-     *
-     * @param tableList 导入表列表
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void importGenTable(List<GenTable> tableList) {
-        String operName = LoginHelper.getUsername();
-        try {
-            for (GenTable table : tableList) {
-                String tableName = table.getTableName();
-                GenUtils.initTable(table, operName);
-                int row = baseMapper.insert(table);
-                if (row > 0) {
-                    // 保存列信息
-                    List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
-                    List<GenTableColumn> saveColumns = new ArrayList<>();
-                    for (GenTableColumn column : genTableColumns) {
-                        GenUtils.initColumnField(column, table);
-                        saveColumns.add(column);
-                    }
-                    if (CollUtil.isNotEmpty(saveColumns)) {
-                        genTableColumnMapper.insertBatch(saveColumns);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new ServiceException("导入失败：" + e.getMessage());
-        }
-    }
-
-    /**
-     * 预览代码
-     *
-     * @param tableId 表编号
-     * @return 预览数据列表
-     */
-    @Override
-    public Map<String, String> previewCode(Long tableId) {
-        Map<String, String> dataMap = new LinkedHashMap<>();
-        // 查询表信息
-        GenTable table = baseMapper.selectGenTableById(tableId);
-        List<Long> menuIds = new ArrayList<>();
-        for (int i = 0; i < 6; i++) {
-            menuIds.add(identifierGenerator.nextId(null).longValue());
-        }
-        table.setMenuIds(menuIds);
-        // 设置主键列信息
-        setPkColumn(table);
-        VelocityInitializer.initVelocity();
-
-        VelocityContext context = VelocityUtils.prepareContext(table);
-
-        // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
-        for (String template : templates) {
-            // 渲染模板
-            StringWriter sw = new StringWriter();
-            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
-            tpl.merge(context, sw);
-            dataMap.put(template, sw.toString());
-        }
-        return dataMap;
-    }
-
-
-    @Override
-    public byte[] downloadCode(Long tableId) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        ZipOutputStream zip = new ZipOutputStream(outputStream);
-        generatorCode(tableId, zip);
-        IoUtil.close(zip);
-        return outputStream.toByteArray();
-    }
-
-    /**
-     * 生成代码（下载方式）
-     *
-     * @param tableIds 表名称
-     * @return 数据
-     */
-    @Override
-    public byte[] downloadCode(String[] tableIds) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        ZipOutputStream zip = new ZipOutputStream(outputStream);
-        for (String tableId : tableIds) {
-            generatorCode(Long.parseLong(tableId), zip);
-        }
-        IoUtil.close(zip);
-        return outputStream.toByteArray();
-    }
-
-    /**
-     * 生成代码（自定义路径）
-     *
-     * @param tableName 表名称
-     */
-    @Override
-    public void generatorCode(String tableName) {
-        // 查询表信息
-        GenTable table = baseMapper.selectGenTableByName(tableName);
-        // 设置主键列信息
-        setPkColumn(table);
-
-        VelocityInitializer.initVelocity();
-
-        VelocityContext context = VelocityUtils.prepareContext(table);
-
-        // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
-        for (String template : templates) {
-            if (!StringUtils.containsAny(template, "sql.vm", "api.ts.vm", "types.ts.vm", "index.vue.vm", "index-tree.vue.vm")) {
-                // 渲染模板
-                StringWriter sw = new StringWriter();
-                Template tpl = Velocity.getTemplate(template, Constants.UTF8);
-                tpl.merge(context, sw);
-                try {
-                    String path = getGenPath(table, template);
-                    FileUtils.writeUtf8String(sw.toString(), path);
-                } catch (Exception e) {
-                    throw new ServiceException("渲染模板失败，表名：" + table.getTableName());
-                }
-            }
-        }
-    }
-
-    /**
-     * 同步数据库
-     *
-     * @param tableName 表名称
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void synchDb(String tableName) {
-        GenTable table = baseMapper.selectGenTableByName(tableName);
-        List<GenTableColumn> tableColumns = table.getColumns();
-        Map<String, GenTableColumn> tableColumnMap = StreamUtils.toIdentityMap(tableColumns, GenTableColumn::getColumnName);
-
-        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
-        if (CollUtil.isEmpty(dbTableColumns)) {
-            throw new ServiceException("同步数据失败，原表结构不存在");
-        }
-        List<String> dbTableColumnNames = StreamUtils.toList(dbTableColumns, GenTableColumn::getColumnName);
-
-        List<GenTableColumn> saveColumns = new ArrayList<>();
-        dbTableColumns.forEach(column -> {
-            GenUtils.initColumnField(column, table);
-            if (tableColumnMap.containsKey(column.getColumnName())) {
-                GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
-                column.setColumnId(prevColumn.getColumnId());
-                if (column.isList()) {
-                    // 如果是列表，继续保留查询方式/字典类型选项
-                    column.setDictType(prevColumn.getDictType());
-                    column.setQueryType(prevColumn.getQueryType());
-                }
-                if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()
-                    && (column.isInsert() || column.isEdit())
-                    && ((column.isUsableColumn()) || (!column.isSuperColumn()))) {
-                    // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项
-                    column.setIsRequired(prevColumn.getIsRequired());
-                    column.setHtmlType(prevColumn.getHtmlType());
-                }
-            }
-            saveColumns.add(column);
-        });
-        if (CollUtil.isNotEmpty(saveColumns)) {
-            genTableColumnMapper.insertOrUpdateBatch(saveColumns);
-        }
-        List<GenTableColumn> delColumns = StreamUtils.filter(tableColumns, column -> !dbTableColumnNames.contains(column.getColumnName()));
-        if (CollUtil.isNotEmpty(delColumns)) {
-            List<Long> ids = StreamUtils.toList(delColumns, GenTableColumn::getColumnId);
-            genTableColumnMapper.deleteBatchIds(ids);
-        }
-    }
-
-    /**
-     * 查询表信息并生成代码
-     */
-    /**
-     * 查询表信息并生成代码
-     */
-    private void generatorCode(Long tableId, ZipOutputStream zip) {
-        // 查询表信息
-        GenTable table = baseMapper.selectGenTableById(tableId);
-        List<Long> menuIds = new ArrayList<>();
-        for (int i = 0; i < 6; i++) {
-            menuIds.add(identifierGenerator.nextId(null).longValue());
-        }
-        table.setMenuIds(menuIds);
-        // 设置主键列信息
-        setPkColumn(table);
-
-        VelocityInitializer.initVelocity();
-
-        VelocityContext context = VelocityUtils.prepareContext(table);
-
-        // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
-        for (String template : templates) {
-            // 渲染模板
-            StringWriter sw = new StringWriter();
-            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
-            tpl.merge(context, sw);
-            try {
-                // 添加到zip
-                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
-                IoUtil.write(zip, StandardCharsets.UTF_8, false, sw.toString());
-                IoUtil.close(sw);
-                zip.flush();
-                zip.closeEntry();
-            } catch (IOException e) {
-                log.error("渲染模板失败，表名：" + table.getTableName(), e);
-            }
-        }
-    }
-
-    /**
-     * 修改保存参数校验
-     *
-     * @param genTable 业务信息
-     */
-    @Override
-    public void validateEdit(GenTable genTable) {
-        if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
-            String options = JsonUtils.toJsonString(genTable.getParams());
-            Dict paramsObj = JsonUtils.parseMap(options);
-            if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_CODE))) {
-                throw new ServiceException("树编码字段不能为空");
-            } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_PARENT_CODE))) {
-                throw new ServiceException("树父编码字段不能为空");
-            } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_NAME))) {
-                throw new ServiceException("树名称字段不能为空");
-            }
-        }
-    }
-
-    /**
-     * 设置主键列信息
-     *
-     * @param table 业务表信息
-     */
-    public void setPkColumn(GenTable table) {
-        for (GenTableColumn column : table.getColumns()) {
-            if (column.isPk()) {
-                table.setPkColumn(column);
-                break;
-            }
-        }
-        if (ObjectUtil.isNull(table.getPkColumn())) {
-            table.setPkColumn(table.getColumns().get(0));
-        }
-
-    }
-
-    /**
-     * 设置代码生成其他选项值
-     *
-     * @param genTable 设置后的生成对象
-     */
-    public void setTableFromOptions(GenTable genTable) {
-        Dict paramsObj = JsonUtils.parseMap(genTable.getOptions());
-        if (ObjectUtil.isNotNull(paramsObj)) {
-            String treeCode = paramsObj.getStr(GenConstants.TREE_CODE);
-            String treeParentCode = paramsObj.getStr(GenConstants.TREE_PARENT_CODE);
-            String treeName = paramsObj.getStr(GenConstants.TREE_NAME);
-            String parentMenuId = paramsObj.getStr(GenConstants.PARENT_MENU_ID);
-            String parentMenuName = paramsObj.getStr(GenConstants.PARENT_MENU_NAME);
-
-            genTable.setTreeCode(treeCode);
-            genTable.setTreeParentCode(treeParentCode);
-            genTable.setTreeName(treeName);
-            genTable.setParentMenuId(parentMenuId);
-            genTable.setParentMenuName(parentMenuName);
-        }
-    }
-
-    /**
-     * 获取代码生成地址
-     *
-     * @param table    业务表信息
-     * @param template 模板文件路径
-     * @return 生成地址
-     */
-    public static String getGenPath(GenTable table, String template) {
-        String genPath = table.getGenPath();
-        if (StringUtils.equals(genPath, "/")) {
-            return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
-        }
-        return genPath + File.separator + VelocityUtils.getFileName(template, table);
-    }
-}
-

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/service/IGenTableService.java

@@ -1,13 +1,5 @@
 package org.ruoyi.generator.service;
 
-import org.ruoyi.core.page.PageQuery;
-import org.ruoyi.core.page.TableDataInfo;
-import org.ruoyi.generator.domain.GenTable;
-import org.ruoyi.generator.domain.GenTableColumn;
-
-import java.util.List;
-import java.util.Map;
-
 /**
  * 业务 服务层
  *
@@ -15,106 +7,6 @@ import java.util.Map;
  */
 public interface IGenTableService {
 
-    /**
-     * 查询业务字段列表
-     *
-     * @param tableId 业务字段编号
-     * @return 业务字段集合
-     */
-    List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
-
-    /**
-     * 查询业务列表
-     *
-     * @param genTable 业务信息
-     * @return 业务集合
-     */
-    TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable, PageQuery pageQuery);
-
-    /**
-     * 查询据库列表
-     *
-     * @param genTable 业务信息
-     * @return 数据库表集合
-     */
-    TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable, PageQuery pageQuery);
-
-    /**
-     * 查询据库列表
-     *
-     * @param tableNames 表名称组
-     * @return 数据库表集合
-     */
-    List<GenTable> selectDbTableListByNames(String[] tableNames);
-
-    /**
-     * 查询所有表信息
-     *
-     * @return 表信息集合
-     */
-    List<GenTable> selectGenTableAll();
-
-    /**
-     * 查询业务信息
-     *
-     * @param id 业务ID
-     * @return 业务信息
-     */
-    GenTable selectGenTableById(Long id);
-
-    /**
-     * 修改业务
-     *
-     * @param genTable 业务信息
-     * @return 结果
-     */
-    void updateGenTable(GenTable genTable);
-
-    /**
-     * 删除业务信息
-     *
-     * @param tableIds 需要删除的表数据ID
-     * @return 结果
-     */
-    void deleteGenTableByIds(Long[] tableIds);
-
-    /**
-     * 导入表结构
-     *
-     * @param tableList 导入表列表
-     */
-    void importGenTable(List<GenTable> tableList);
-
-    /**
-     * 预览代码
-     *
-     * @param tableId 表编号
-     * @return 预览数据列表
-     */
-    Map<String, String> previewCode(Long tableId);
-
-    /**
-     * 生成代码（下载方式）
-     *
-     * @param tableName 表名称
-     * @return 数据
-     */
-    byte[] downloadCode(Long tableName);
-
-    /**
-     * 生成代码（自定义路径）
-     *
-     * @param tableName 表名称
-     * @return 数据
-     */
-    void generatorCode(String tableName);
-
-    /**
-     * 同步数据库
-     *
-     * @param tableName 表名称
-     */
-    void synchDb(String tableName);
 
     /**
      * 批量生成代码（下载方式）
@@ -124,10 +16,4 @@ public interface IGenTableService {
      */
     byte[] downloadCode(String[] tableIds);
 
-    /**
-     * 修改保存参数校验
-     *
-     * @param genTable 业务信息
-     */
-    void validateEdit(GenTable genTable);
 }

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/service/ISchemaFieldService.java

@@ -0,0 +1,59 @@
+package org.ruoyi.generator.service;
+
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.generator.domain.bo.SchemaFieldBo;
+import org.ruoyi.generator.domain.vo.SchemaFieldVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 数据模型字段Service接口
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+public interface ISchemaFieldService {
+
+    /**
+     * 查询数据模型字段
+     */
+    SchemaFieldVo queryById(Long id);
+
+    /**
+     * 查询数据模型字段列表
+     */
+    TableDataInfo<SchemaFieldVo> queryPageList(SchemaFieldBo bo, PageQuery pageQuery);
+
+    /**
+     * 新增数据模型字段
+     */
+    Boolean insertByBo(SchemaFieldBo bo);
+
+    /**
+     * 修改数据模型字段
+     */
+    Boolean updateByBo(SchemaFieldBo bo);
+
+    /**
+     * 校验并批量删除数据模型字段信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 批量更新字段配置
+     */
+    Boolean batchUpdateFieldConfig(List<SchemaFieldBo> fields);
+
+    /**
+     * 根据模型ID查询字段列表
+     */
+    List<SchemaFieldVo> queryListBySchemaId(Long schemaId);
+
+    /**
+     * 根据表名获取代码生成元数据
+     */
+    Object getMetaDataByTableName(String tableName);
+
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/service/ISchemaGroupService.java

@@ -0,0 +1,49 @@
+package org.ruoyi.generator.service;
+
+
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.generator.domain.bo.SchemaGroupBo;
+import org.ruoyi.generator.domain.vo.SchemaGroupVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 数据模型分组Service接口
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+public interface ISchemaGroupService {
+
+    /**
+     * 查询数据模型分组
+     */
+    SchemaGroupVo queryById(Long id);
+
+    /**
+     * 查询数据模型分组列表
+     */
+    TableDataInfo<SchemaGroupVo> queryPageList(SchemaGroupBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询数据模型分组列表
+     */
+    List<SchemaGroupVo> queryList(SchemaGroupBo bo);
+
+    /**
+     * 新增数据模型分组
+     */
+    Boolean insertByBo(SchemaGroupBo bo);
+
+    /**
+     * 修改数据模型分组
+     */
+    Boolean updateByBo(SchemaGroupBo bo);
+
+    /**
+     * 校验并批量删除数据模型分组信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/service/ISchemaService.java

@@ -0,0 +1,54 @@
+package org.ruoyi.generator.service;
+
+
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.generator.domain.bo.SchemaBo;
+import org.ruoyi.generator.domain.vo.SchemaVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 数据模型Service接口
+ *
+ * @author ruoyi
+ * @date 2024-01-01
+ */
+public interface ISchemaService {
+
+    /**
+     * 查询数据模型
+     */
+    SchemaVo queryById(Long id);
+
+    /**
+     * 查询数据模型列表
+     */
+    TableDataInfo<SchemaVo> queryPageList(SchemaBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询数据模型列表
+     */
+    List<SchemaVo> queryList(SchemaBo bo);
+
+    /**
+     * 新增数据模型
+     */
+    Boolean insertByBo(SchemaBo bo);
+
+    /**
+     * 修改数据模型
+     */
+    Boolean updateByBo(SchemaBo bo);
+
+    /**
+     * 校验并批量删除数据模型信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据表名查询数据模型
+     */
+    SchemaVo queryByTableName(String tableName);
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/service/impl/GenTableServiceImpl.java

@@ -0,0 +1,122 @@
+package org.ruoyi.generator.service.impl;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.ruoyi.common.core.constant.Constants;
+import org.ruoyi.generator.domain.GenTable;
+import org.ruoyi.generator.domain.GenTableColumn;
+import org.ruoyi.generator.mapper.GenTableMapper;
+import org.ruoyi.generator.service.IGenTableService;
+import org.ruoyi.generator.util.VelocityInitializer;
+import org.ruoyi.generator.util.VelocityUtils;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * 业务 服务层实现
+ *
+ * @author Lion Li
+ */
+//@DS("#header.datasource")
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class GenTableServiceImpl implements IGenTableService {
+
+    private final GenTableMapper baseMapper;
+    private final IdentifierGenerator identifierGenerator;
+
+
+    /**
+     * 生成代码（下载方式）
+     *
+     * @param tableIds 表名称
+     * @return 数据
+     */
+    @Override
+    public byte[] downloadCode(String[] tableIds) {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(outputStream);
+        for (String tableId : tableIds) {
+            generatorCode(Long.parseLong(tableId), zip);
+        }
+        IoUtil.close(zip);
+        return outputStream.toByteArray();
+    }
+
+
+    /**
+     * 查询表信息并生成代码
+     */
+    /**
+     * 查询表信息并生成代码
+     */
+    private void generatorCode(Long tableId, ZipOutputStream zip) {
+        // 查询表信息
+        GenTable table = baseMapper.selectGenTableById(tableId);
+        List<Long> menuIds = new ArrayList<>();
+        for (int i = 0; i < 6; i++) {
+            menuIds.add(identifierGenerator.nextId(null).longValue());
+        }
+        table.setMenuIds(menuIds);
+        // 设置主键列信息
+        setPkColumn(table);
+
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList();
+        for (String template : templates) {
+            // 渲染模板
+            StringWriter sw = new StringWriter();
+            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+            tpl.merge(context, sw);
+            try {
+                // 添加到zip
+                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
+                IoUtil.write(zip, StandardCharsets.UTF_8, false, sw.toString());
+                IoUtil.close(sw);
+                zip.flush();
+                zip.closeEntry();
+            } catch (IOException e) {
+                log.error("渲染模板失败，表名：" + table.getTableName(), e);
+            }
+        }
+    }
+
+
+    /**
+     * 设置主键列信息
+     *
+     * @param table 业务表信息
+     */
+    public void setPkColumn(GenTable table) {
+        for (GenTableColumn column : table.getColumns()) {
+            if (column.isPk()) {
+                table.setPkColumn(column);
+                break;
+            }
+        }
+        if (ObjectUtil.isNull(table.getPkColumn())) {
+            table.setPkColumn(table.getColumns().get(0));
+        }
+    }
+
+}
+

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/service/impl/SchemaFieldServiceImpl.java

@@ -0,0 +1,286 @@
+package org.ruoyi.generator.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.utils.MapstructUtils;
+import org.ruoyi.common.core.utils.StringUtils;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.generator.domain.SchemaField;
+import org.ruoyi.generator.domain.bo.SchemaFieldBo;
+import org.ruoyi.generator.domain.vo.SchemaFieldVo;
+import org.ruoyi.generator.domain.vo.SchemaGroupVo;
+import org.ruoyi.generator.domain.vo.SchemaVo;
+import org.ruoyi.generator.mapper.SchemaFieldMapper;
+import org.ruoyi.generator.service.ISchemaFieldService;
+import org.ruoyi.generator.service.ISchemaGroupService;
+import org.ruoyi.generator.service.ISchemaService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 数据模型字段Service业务层处理
+ *
+ * @author ruoyi
+ */
+@RequiredArgsConstructor
+@Service
+public class SchemaFieldServiceImpl implements ISchemaFieldService {
+
+    private final SchemaFieldMapper baseMapper;
+    private final ISchemaService schemaService;
+    private final ISchemaGroupService schemaGroupService;
+
+    /**
+     * 查询数据模型字段
+     */
+    @Override
+    public SchemaFieldVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询数据模型字段列表
+     */
+    @Override
+    public TableDataInfo<SchemaFieldVo> queryPageList(SchemaFieldBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SchemaField> lqw = buildQueryWrapper(bo);
+        Page<SchemaFieldVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    private LambdaQueryWrapper<SchemaField> buildQueryWrapper(SchemaFieldBo bo) {
+
+        LambdaQueryWrapper<SchemaField> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSchemaId() != null, SchemaField::getSchemaId, bo.getSchemaId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), SchemaField::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCode()), SchemaField::getCode, bo.getCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), SchemaField::getType, bo.getType());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsPk()), SchemaField::getIsPk, bo.getIsPk());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsRequired()), SchemaField::getIsRequired, bo.getIsRequired());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsList()), SchemaField::getIsList, bo.getIsList());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsQuery()), SchemaField::getIsQuery, bo.getIsQuery());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsInsert()), SchemaField::getIsInsert, bo.getIsInsert());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsEdit()), SchemaField::getIsEdit, bo.getIsEdit());
+        lqw.eq(StringUtils.isNotBlank(bo.getQueryType()), SchemaField::getQueryType, bo.getQueryType());
+        lqw.eq(StringUtils.isNotBlank(bo.getHtmlType()), SchemaField::getHtmlType, bo.getHtmlType());
+        lqw.like(StringUtils.isNotBlank(bo.getDictType()), SchemaField::getDictType, bo.getDictType());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SchemaField::getStatus, bo.getStatus());
+        lqw.orderByAsc(SchemaField::getSort);
+        return lqw;
+    }
+
+    /**
+     * 新增数据模型字段
+     */
+    @Override
+    public Boolean insertByBo(SchemaFieldBo bo) {
+        SchemaField add = MapstructUtils.convert(bo, SchemaField.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改数据模型字段
+     */
+    @Override
+    public Boolean updateByBo(SchemaFieldBo bo) {
+        SchemaField update = MapstructUtils.convert(bo, SchemaField.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SchemaField entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除数据模型字段
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 批量更新字段配置
+     */
+    @Override
+    public Boolean batchUpdateFieldConfig(List<SchemaFieldBo> fields) {
+        if (fields == null || fields.isEmpty()) {
+            return false;
+        }
+
+        for (SchemaFieldBo field : fields) {
+            SchemaField update = MapstructUtils.convert(field, SchemaField.class);
+            validEntityBeforeSave(update);
+            baseMapper.updateById(update);
+        }
+        return true;
+    }
+
+    /**
+     * 根据模型ID查询字段列表
+     */
+    @Override
+    public List<SchemaFieldVo> queryListBySchemaId(Long schemaId) {
+        LambdaQueryWrapper<SchemaField> lqw = Wrappers.lambdaQuery();
+        lqw.eq(SchemaField::getSchemaId, schemaId);
+        lqw.eq(SchemaField::getStatus, "0"); // 只查询正常状态的字段
+        lqw.orderByAsc(SchemaField::getSort);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据表名获取代码生成元数据
+     */
+    @Override
+    public Object getMetaDataByTableName(String tableName) {
+        // 根据表名查询Schema
+        SchemaVo schema = schemaService.queryByTableName(tableName);
+        if (schema == null) {
+            return null;
+        }
+        SchemaGroupVo schemaGroupVo = schemaGroupService.queryById(schema.getSchemaGroupId());
+        if (schemaGroupVo == null) {
+            return null;
+        }
+        // 查询Schema对应的字段列表
+        List<SchemaFieldVo> fields = queryListBySchemaId(schema.getId());
+        if (CollUtil.isEmpty(fields)) {
+            return null;
+        }
+
+        // 构建代码生成器需要的数据结构
+        Map<String, Object> result = new HashMap<>();
+        result.put("schemaGroupCode", schemaGroupVo.getCode());
+        result.put("tableName", schema.getTableName());
+        result.put("tableComment", schema.getComment());
+        result.put("className", toCamelCase(schema.getTableName(), true));
+        result.put("tableCamelName", StrUtil.toCamelCase(schema.getTableName()));
+        result.put("functionName", schema.getName());
+        result.put("schemaName", schema.getName());
+
+        // 查找主键字段
+        SchemaFieldVo pkField = fields.stream()
+                .filter(field -> "1".equals(field.getIsPk()))
+                .findFirst()
+                .orElse(null);
+
+        if (pkField != null) {
+            Map<String, Object> pkColumn = new HashMap<>();
+            pkColumn.put("columnName", pkField.getCode());
+            pkColumn.put("columnComment", pkField.getName());
+            pkColumn.put("javaField", toCamelCase(pkField.getCode(), false));
+            pkColumn.put("javaType", getJavaType(pkField.getType()));
+            result.put("pkColumn", pkColumn);
+        }
+
+        // 构建字段列表
+        List<Map<String, Object>> columns = new ArrayList<>();
+        for (SchemaFieldVo field : fields) {
+            Map<String, Object> column = new HashMap<>();
+            column.put("columnName", field.getCode());
+            column.put("columnComment", field.getName());
+            column.put("javaField", toCamelCase(field.getCode(), false));
+            column.put("javaType", getJavaType(field.getType()));
+            column.put("htmlType", field.getHtmlType());
+            column.put("isPk", "1".equals(field.getIsPk()));
+            column.put("isRequired", "1".equals(field.getIsRequired()));
+            column.put("isInsert", "1".equals(field.getIsInsert()));
+            column.put("isEdit", "1".equals(field.getIsEdit()));
+            column.put("isList", "1".equals(field.getIsList()));
+            column.put("isQuery", "1".equals(field.getIsQuery()));
+            column.put("component", getComponentType(field.getHtmlType()));
+            column.put("remark", field.getRemark());
+            columns.add(column);
+        }
+        result.put("columns", columns);
+
+        return result;
+    }
+
+    /**
+     * 转换为驼峰命名
+     */
+    private String toCamelCase(String str, boolean firstUpperCase) {
+        if (StringUtils.isBlank(str)) {
+            return str;
+        }
+
+        StringBuilder result = new StringBuilder();
+        String[] parts = str.split("_");
+        for (int i = 0; i < parts.length; i++) {
+            String part = parts[i].toLowerCase();
+            if (i == 0 && !firstUpperCase) {
+                result.append(part);
+            } else {
+                result.append(part.substring(0, 1).toUpperCase()).append(part.substring(1));
+            }
+        }
+        return result.toString();
+    }
+
+    /**
+     * 获取Java类型
+     */
+    private String getJavaType(String dbType) {
+        if (StringUtils.isBlank(dbType)) {
+            return "String";
+        }
+
+        String type = dbType.toLowerCase();
+        if (type.contains("int") || type.contains("tinyint") || type.contains("smallint")) {
+            return "Integer";
+        } else if (type.contains("bigint")) {
+            return "Long";
+        } else if (type.contains("decimal") || type.contains("numeric") || type.contains("float") || type.contains(
+                "double")) {
+            return "BigDecimal";
+        } else if (type.contains("date") || type.contains("time")) {
+            return "Date";
+        } else if (type.contains("bit") || type.contains("boolean")) {
+            return "Boolean";
+        } else {
+            return "String";
+        }
+    }
+
+    /**
+     * 获取组件类型
+     */
+    private String getComponentType(String htmlType) {
+        if (StringUtils.isBlank(htmlType)) {
+            return "input";
+        }
+
+        return switch (htmlType) {
+            case "textarea" -> "textarea";
+            case "select" -> "select";
+            case "radio" -> "radio";
+            case "checkbox" -> "checkbox";
+            case "datetime" -> "datetime";
+            case "date" -> "date";
+            default -> "input";
+        };
+    }
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/service/impl/SchemaGroupServiceImpl.java

@@ -0,0 +1,110 @@
+package org.ruoyi.generator.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.utils.MapstructUtils;
+import org.ruoyi.common.core.utils.StringUtils;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.generator.domain.SchemaGroup;
+import org.ruoyi.generator.domain.bo.SchemaGroupBo;
+import org.ruoyi.generator.domain.vo.SchemaGroupVo;
+import org.ruoyi.generator.mapper.SchemaGroupMapper;
+import org.ruoyi.generator.service.ISchemaGroupService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 数据模型分组Service业务层处理
+ *
+ * @author ruoyi
+ */
+@RequiredArgsConstructor
+@Service
+public class SchemaGroupServiceImpl implements ISchemaGroupService {
+
+    private final SchemaGroupMapper baseMapper;
+
+    /**
+     * 查询数据模型分组
+     */
+    @Override
+    public SchemaGroupVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询数据模型分组列表
+     */
+    @Override
+    public TableDataInfo<SchemaGroupVo> queryPageList(SchemaGroupBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SchemaGroup> lqw = buildQueryWrapper(bo);
+        Page<SchemaGroupVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询数据模型分组列表
+     */
+    @Override
+    public List<SchemaGroupVo> queryList(SchemaGroupBo bo) {
+        LambdaQueryWrapper<SchemaGroup> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SchemaGroup> buildQueryWrapper(SchemaGroupBo bo) {
+        LambdaQueryWrapper<SchemaGroup> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), SchemaGroup::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCode()), SchemaGroup::getCode, bo.getCode());
+        lqw.eq(bo.getSort() != null, SchemaGroup::getSort, bo.getSort());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SchemaGroup::getStatus, bo.getStatus());
+        lqw.orderByAsc(SchemaGroup::getSort);
+        return lqw;
+    }
+
+    /**
+     * 新增数据模型分组
+     */
+    @Override
+    public Boolean insertByBo(SchemaGroupBo bo) {
+        SchemaGroup add = MapstructUtils.convert(bo, SchemaGroup.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改数据模型分组
+     */
+    @Override
+    public Boolean updateByBo(SchemaGroupBo bo) {
+        SchemaGroup update = MapstructUtils.convert(bo, SchemaGroup.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SchemaGroup entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除数据模型分组
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/service/impl/SchemaServiceImpl.java

@@ -0,0 +1,123 @@
+package org.ruoyi.generator.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.ruoyi.common.core.utils.MapstructUtils;
+import org.ruoyi.common.core.utils.StringUtils;
+import org.ruoyi.core.page.PageQuery;
+import org.ruoyi.core.page.TableDataInfo;
+import org.ruoyi.generator.domain.Schema;
+import org.ruoyi.generator.domain.bo.SchemaBo;
+import org.ruoyi.generator.domain.vo.SchemaVo;
+import org.ruoyi.generator.mapper.SchemaMapper;
+import org.ruoyi.generator.service.ISchemaService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 数据模型Service业务层处理
+ *
+ * @author ruoyi
+ */
+@RequiredArgsConstructor
+@Service
+public class SchemaServiceImpl implements ISchemaService {
+
+    private final SchemaMapper baseMapper;
+
+    /**
+     * 查询数据模型
+     */
+    @Override
+    public SchemaVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询数据模型列表
+     */
+    @Override
+    public TableDataInfo<SchemaVo> queryPageList(SchemaBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<Schema> lqw = buildQueryWrapper(bo);
+        Page<SchemaVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询数据模型列表
+     */
+    @Override
+    public List<SchemaVo> queryList(SchemaBo bo) {
+        LambdaQueryWrapper<Schema> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<Schema> buildQueryWrapper(SchemaBo bo) {
+        LambdaQueryWrapper<Schema> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSchemaGroupId() != null, Schema::getSchemaGroupId, bo.getSchemaGroupId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), Schema::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCode()), Schema::getCode, bo.getCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getTableName()), Schema::getTableName, bo.getTableName());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Schema::getStatus, bo.getStatus());
+        lqw.orderByAsc(Schema::getSort);
+        return lqw;
+    }
+
+    /**
+     * 新增数据模型
+     */
+    @Override
+    public Boolean insertByBo(SchemaBo bo) {
+        Schema add = MapstructUtils.convert(bo, Schema.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改数据模型
+     */
+    @Override
+    public Boolean updateByBo(SchemaBo bo) {
+        Schema update = MapstructUtils.convert(bo, Schema.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(Schema entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除数据模型
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据表名查询数据模型
+     */
+    @Override
+    public SchemaVo queryByTableName(String tableName) {
+        LambdaQueryWrapper<Schema> lqw = Wrappers.lambdaQuery();
+        lqw.eq(Schema::getTableName, tableName);
+        // 只查询正常状态的模型
+        lqw.eq(Schema::getStatus, "0");
+        return baseMapper.selectVoOne(lqw);
+    }
+}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/util/GenUtils.java

@@ -1,233 +0,0 @@
-package org.ruoyi.generator.util;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.RegExUtils;
-import org.ruoyi.common.core.utils.StringUtils;
-import org.ruoyi.common.satoken.utils.LoginHelper;
-import org.ruoyi.generator.config.GenConfig;
-import org.ruoyi.generator.constant.GenConstants;
-import org.ruoyi.generator.domain.GenTable;
-import org.ruoyi.generator.domain.GenTableColumn;
-
-import java.util.Arrays;
-
-/**
- * 代码生成器 工具类
- *
- * @author ruoyi
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class GenUtils {
-
-    /**
-     * 初始化表信息
-     */
-    public static void initTable(GenTable genTable, String operName) {
-        genTable.setClassName(convertClassName(genTable.getTableName()));
-        genTable.setPackageName(GenConfig.getPackageName());
-        genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
-        genTable.setBusinessName(getBusinessName(genTable.getTableName()));
-        genTable.setFunctionName(replaceText(genTable.getTableComment()));
-        genTable.setFunctionAuthor(GenConfig.getAuthor());
-        genTable.setCreateBy(LoginHelper.getUserId());
-    }
-
-    /**
-     * 初始化列属性字段
-     */
-    public static void initColumnField(GenTableColumn column, GenTable table) {
-        String dataType = getDbType(column.getColumnType());
-        String columnName = column.getColumnName();
-        column.setTableId(table.getTableId());
-        column.setCreateBy(table.getCreateBy());
-        // 设置java字段名
-        column.setJavaField(StringUtils.toCamelCase(columnName));
-        // 设置默认类型
-        column.setJavaType(GenConstants.TYPE_STRING);
-        column.setQueryType(GenConstants.QUERY_EQ);
-
-        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) {
-            // 字符串长度超过500设置为文本域
-            Integer columnLength = getColumnLength(column.getColumnType());
-            String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
-            column.setHtmlType(htmlType);
-        } else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) {
-            column.setJavaType(GenConstants.TYPE_DATE);
-            column.setHtmlType(GenConstants.HTML_DATETIME);
-        } else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) {
-            column.setHtmlType(GenConstants.HTML_INPUT);
-
-            // 如果是浮点型 统一用BigDecimal
-            String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), StringUtils.SEPARATOR);
-            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) {
-                column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
-            }
-            // 如果是整形
-            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) {
-                column.setJavaType(GenConstants.TYPE_INTEGER);
-            }
-            // 长整形
-            else {
-                column.setJavaType(GenConstants.TYPE_LONG);
-            }
-        }
-
-        // BO对象 默认插入勾选
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_ADD, columnName) && !column.isPk()) {
-            column.setIsInsert(GenConstants.REQUIRE);
-        }
-        // BO对象 默认编辑勾选
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
-            column.setIsEdit(GenConstants.REQUIRE);
-        }
-        // BO对象 默认是否必填勾选
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
-            column.setIsRequired(GenConstants.REQUIRE);
-        }
-        // VO对象 默认返回勾选
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName)) {
-            column.setIsList(GenConstants.REQUIRE);
-        }
-        // BO对象 默认查询勾选
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) {
-            column.setIsQuery(GenConstants.REQUIRE);
-        }
-
-        // 查询字段类型
-        if (StringUtils.endsWithIgnoreCase(columnName, "name")) {
-            column.setQueryType(GenConstants.QUERY_LIKE);
-        }
-        // 状态字段设置单选框
-        if (StringUtils.endsWithIgnoreCase(columnName, "status")) {
-            column.setHtmlType(GenConstants.HTML_RADIO);
-        }
-        // 类型&性别字段设置下拉框
-        else if (StringUtils.endsWithIgnoreCase(columnName, "type")
-            || StringUtils.endsWithIgnoreCase(columnName, "sex")) {
-            column.setHtmlType(GenConstants.HTML_SELECT);
-        }
-        // 图片字段设置图片上传控件
-        else if (StringUtils.endsWithIgnoreCase(columnName, "image")) {
-            column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
-        }
-        // 文件字段设置文件上传控件
-        else if (StringUtils.endsWithIgnoreCase(columnName, "file")) {
-            column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
-        }
-        // 内容字段设置富文本控件
-        else if (StringUtils.endsWithIgnoreCase(columnName, "content")) {
-            column.setHtmlType(GenConstants.HTML_EDITOR);
-        }
-    }
-
-    /**
-     * 校验数组是否包含指定值
-     *
-     * @param arr         数组
-     * @param targetValue 值
-     * @return 是否包含
-     */
-    public static boolean arraysContains(String[] arr, String targetValue) {
-        return Arrays.asList(arr).contains(targetValue);
-    }
-
-    /**
-     * 获取模块名
-     *
-     * @param packageName 包名
-     * @return 模块名
-     */
-    public static String getModuleName(String packageName) {
-        int lastIndex = packageName.lastIndexOf(".");
-        int nameLength = packageName.length();
-        return StringUtils.substring(packageName, lastIndex + 1, nameLength);
-    }
-
-    /**
-     * 获取业务名
-     *
-     * @param tableName 表名
-     * @return 业务名
-     */
-    public static String getBusinessName(String tableName) {
-        int firstIndex = tableName.indexOf("_");
-        int nameLength = tableName.length();
-        String businessName = StringUtils.substring(tableName, firstIndex + 1, nameLength);
-        businessName = StringUtils.toCamelCase(businessName);
-        return businessName;
-    }
-
-    /**
-     * 表名转换成Java类名
-     *
-     * @param tableName 表名称
-     * @return 类名
-     */
-    public static String convertClassName(String tableName) {
-        boolean autoRemovePre = GenConfig.getAutoRemovePre();
-        String tablePrefix = GenConfig.getTablePrefix();
-        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) {
-            String[] searchList = StringUtils.split(tablePrefix, StringUtils.SEPARATOR);
-            tableName = replaceFirst(tableName, searchList);
-        }
-        return StringUtils.convertToCamelCase(tableName);
-    }
-
-    /**
-     * 批量替换前缀
-     *
-     * @param replacementm 替换值
-     * @param searchList   替换列表
-     * @return
-     */
-    public static String replaceFirst(String replacementm, String[] searchList) {
-        String text = replacementm;
-        for (String searchString : searchList) {
-            if (replacementm.startsWith(searchString)) {
-                text = replacementm.replaceFirst(searchString, "");
-                break;
-            }
-        }
-        return text;
-    }
-
-    /**
-     * 关键字替换
-     *
-     * @param text 需要被替换的名字
-     * @return 替换后的名字
-     */
-    public static String replaceText(String text) {
-        return RegExUtils.replaceAll(text, "(?:表|若依)", "");
-    }
-
-    /**
-     * 获取数据库类型字段
-     *
-     * @param columnType 列类型
-     * @return 截取后的列类型
-     */
-    public static String getDbType(String columnType) {
-        if (StringUtils.indexOf(columnType, '(') > 0) {
-            return StringUtils.substringBefore(columnType, "(");
-        } else {
-            return columnType;
-        }
-    }
-
-    /**
-     * 获取字段长度
-     *
-     * @param columnType 列类型
-     * @return 截取后的列类型
-     */
-    public static Integer getColumnLength(String columnType) {
-        if (StringUtils.indexOf(columnType, '(') > 0) {
-            String length = StringUtils.substringBetween(columnType, "(", ")");
-            return Integer.valueOf(length);
-        } else {
-            return 0;
-        }
-    }
-}

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/util/VelocityInitializer.java

@@ -22,7 +22,8 @@ public class VelocityInitializer {
         Properties p = new Properties();
         try {
             // 加载classpath目录下的vm文件
-            p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+            p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader"
+                    + ".ClasspathResourceLoader");
             // 定义字符集
             p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8);
             // 初始化Velocity引擎，指定配置Properties

ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/util/VelocityUtils.java

@@ -15,7 +15,12 @@ import org.ruoyi.generator.domain.GenTable;
 import org.ruoyi.generator.domain.GenTableColumn;
 import org.ruoyi.helper.DataBaseHelper;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 /**
  * 模板处理工具类
@@ -130,7 +135,7 @@ public class VelocityUtils {
      *
      * @return 模板列表
      */
-  public static List<String> getTemplateList(String tplCategory) {
+    public static List<String> getTemplateList() {
         List<String> templates = new ArrayList<>();
         templates.add("vm/java/domain.java.vm");
         templates.add("vm/java/vo.java.vm");
@@ -149,28 +154,6 @@ public class VelocityUtils {
         } else {
             templates.add("vm/sql/sql.vm");
         }
-    templates.add("vm/ts/api.ts.vm");
-    templates.add("vm/ts/types.ts.vm");
-    if (GenConstants.TPL_CRUD.equals(tplCategory)) {
-      templates.add("vm/vue/index.vue.vm");
-    } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
-      templates.add("vm/vue/index-tree.vue.vm");
-    }
-
-    /**
-     * 添加vben5
-     */
-    templates.add("vm/vben5/api/index.ts.vm");
-    templates.add("vm/vben5/api/model.d.ts.vm");
-    templates.add("vm/vben5/views/data.ts.vm");
-    if (GenConstants.TPL_CRUD.equals(tplCategory)) {
-      templates.add("vm/vben5/views/index_vben.vue.vm");
-      templates.add("vm/vben5/views/popup.vue.vm");
-    } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
-      templates.add("vm/vben5/views/index_vben_tree.vue.vm");
-      templates.add("vm/vben5/views/popup_tree.vue.vm");
-    }
-
         return templates;
     }
 
@@ -249,10 +232,12 @@ public class VelocityUtils {
             fileName = StringUtils.format("{}/views/{}/{}/data.ts", vben5Path, moduleName, businessName);
         }
         if (template.contains("vm/vben5/views/popup.vue.vm")) {
-      fileName = StringUtils.format("{}/views/{}/{}/{}-{}.vue", vben5Path, moduleName, businessName, businessName, popupComponent);
+            fileName = StringUtils.format("{}/views/{}/{}/{}-{}.vue", vben5Path, moduleName, businessName,
+                    businessName, popupComponent);
         }
         if (template.contains("vm/vben5/views/popup_tree.vue.vm")) {
-      fileName = StringUtils.format("{}/views/{}/{}/{}-{}.vue", vben5Path, moduleName, businessName, businessName, popupComponent);
+            fileName = StringUtils.format("{}/views/{}/{}/{}-{}.vue", vben5Path, moduleName, businessName,
+                    businessName, popupComponent);
         }
 
         return fileName;
@@ -315,7 +300,7 @@ public class VelocityUtils {
         for (GenTableColumn column : columns) {
             if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
                     column.getHtmlType(),
-          new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX })) {
+                    new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) {
                 dicts.add("'" + column.getDictType() + "'");
             }
         }

ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -1,93 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.ruoyi.generator.mapper.GenTableColumnMapper">
 
-    <resultMap type="org.ruoyi.generator.domain.GenTableColumn" id="GenTableColumnResult">
-    </resultMap>
-
-    <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
-        <if test="@org.ruoyi.helper.DataBaseHelper@isMySql()">
-            select column_name,
-                   (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required,
-                   (case when column_key = 'PRI' then '1' else '0' end) as is_pk,
-                   ordinal_position as sort,
-                   column_comment,
-                   (case when extra = 'auto_increment' then '1' else '0' end) as is_increment,
-                   column_type
-            from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
-            order by ordinal_position
-        </if>
-        <if test="@org.ruoyi.helper.DataBaseHelper@isOracle()">
-            select lower(temp.column_name) as column_name,
-                    (case when (temp.nullable = 'N'  and  temp.constraint_type != 'P') then '1' else null end) as is_required,
-                    (case when temp.constraint_type = 'P' then '1' else '0' end) as is_pk,
-                    temp.column_id as sort,
-                    temp.comments as column_comment,
-                    (case when temp.constraint_type = 'P' then '1' else '0' end) as is_increment,
-                    lower(temp.data_type) as column_type
-            from (
-                select col.column_id, col.column_name,col.nullable, col.data_type, colc.comments, uc.constraint_type, row_number()
-                    over (partition by col.column_name order by uc.constraint_type desc) as row_flg
-                from user_tab_columns col
-                left join user_col_comments colc on colc.table_name = col.table_name and colc.column_name = col.column_name
-                left join user_cons_columns ucc on ucc.table_name = col.table_name and ucc.column_name = col.column_name
-                left join user_constraints uc on uc.constraint_name = ucc.constraint_name
-                where col.table_name = upper(#{tableName})
-            ) temp
-            WHERE temp.row_flg = 1
-            ORDER BY temp.column_id
-        </if>
-        <if test="@org.ruoyi.helper.DataBaseHelper@isPostgerSql()">
-            SELECT column_name, is_required, is_pk, sort, column_comment, is_increment, column_type
-            FROM (
-                SELECT c.relname AS table_name,
-                       a.attname AS column_name,
-                       d.description AS column_comment,
-                       CASE WHEN a.attnotnull AND con.conname IS NULL THEN 1 ELSE 0
-                       END AS is_required,
-                       CASE WHEN con.conname IS NOT NULL THEN 1 ELSE 0
-                       END AS is_pk,
-                       a.attnum AS sort,
-                       CASE WHEN "position"(pg_get_expr(ad.adbin, ad.adrelid),
-                           ((c.relname::text || '_'::text) || a.attname::text) || '_seq'::text) > 0 THEN 1 ELSE 0
-                       END AS is_increment,
-                       btrim(
-                           CASE WHEN t.typelem <![CDATA[ <> ]]> 0::oid AND t.typlen = '-1'::integer THEN 'ARRAY'::text ELSE
-                                CASE WHEN t.typtype = 'd'::"char" THEN format_type(t.typbasetype, NULL::integer)
-                                ELSE format_type(a.atttypid, NULL::integer) END
-                           END, '"'::text
-                       ) AS column_type
-                FROM pg_attribute a
-                    JOIN (pg_class c JOIN pg_namespace n ON c.relnamespace = n.oid) ON a.attrelid = c.oid
-                    LEFT JOIN pg_description d ON d.objoid = c.oid AND a.attnum = d.objsubid
-                    LEFT JOIN pg_constraint con ON con.conrelid = c.oid AND (a.attnum = ANY (con.conkey))
-                    LEFT JOIN pg_attrdef ad ON a.attrelid = ad.adrelid AND a.attnum = ad.adnum
-                    LEFT JOIN pg_type t ON a.atttypid = t.oid
-                WHERE (c.relkind = ANY (ARRAY ['r'::"char", 'p'::"char"]))
-                    AND a.attnum > 0
-                    AND n.nspname = 'public'::name
-                ORDER BY c.relname, a.attnum
-            ) temp
-            WHERE table_name = (#{tableName})
-                AND column_type <![CDATA[ <> ]]> '-'
-        </if>
-        <if test="@org.ruoyi.helper.DataBaseHelper@isSqlServer()">
-            SELECT
-                cast(A.NAME as nvarchar) as column_name,
-                cast(B.NAME as nvarchar) + (case when B.NAME = 'numeric' then '(' + cast(A.prec as nvarchar) + ',' + cast(A.scale as nvarchar) + ')' else '' end) as column_type,
-                cast(G.[VALUE] as nvarchar) as column_comment,
-                (SELECT 1 FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE Z WHERE TABLE_NAME = D.NAME and A.NAME = Z.column_name  ) as is_pk,
-                colorder as sort
-            FROM SYSCOLUMNS A
-                LEFT JOIN SYSTYPES B ON A.XTYPE = B.XUSERTYPE
-                INNER JOIN SYSOBJECTS D ON A.ID = D.ID AND D.XTYPE='U' AND D.NAME != 'DTPROPERTIES'
-                LEFT JOIN SYS.EXTENDED_PROPERTIES G ON A.ID = G.MAJOR_ID AND A.COLID = G.MINOR_ID
-                LEFT JOIN SYS.EXTENDED_PROPERTIES F ON D.ID = F.MAJOR_ID AND F.MINOR_ID = 0
-            WHERE D.NAME = #{tableName}
-            ORDER BY A.COLORDER
-        </if>
-    </select>
 
 </mapper>

ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -1,220 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.ruoyi.generator.mapper.GenTableMapper">
 
     <!-- 多结构嵌套自动映射需带上每个实体的主键id 否则映射会失败 -->
     <resultMap type="org.ruoyi.generator.domain.GenTable" id="GenTableResult">
-        <id property="tableId" column="table_id" />
+        <id property="tableId" column="table_id"/>
-        <collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult" />
+        <collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult"/>
     </resultMap>
 
     <resultMap type="org.ruoyi.generator.domain.GenTableColumn" id="GenTableColumnResult">
         <id property="columnId" column="column_id"/>
     </resultMap>
 
-    <select id="selectPageDbTableList" resultMap="GenTableResult">
-        <if test="@org.ruoyi.helper.DataBaseHelper@isMySql()">
-            select table_name, table_comment, create_time, update_time
-            from information_schema.tables
-            where table_schema = (select database())
-            AND table_name NOT LIKE 'xxl_job_%' AND table_name NOT LIKE 'gen_%'
-            AND table_name NOT IN (select table_name from gen_table)
-            <if test="genTable.tableName != null and genTable.tableName != ''">
-                AND lower(table_name) like lower(concat('%', #{genTable.tableName}, '%'))
-            </if>
-            <if test="genTable.tableComment != null and genTable.tableComment != ''">
-                AND lower(table_comment) like lower(concat('%', #{genTable.tableComment}, '%'))
-            </if>
-            order by create_time desc
-        </if>
-        <if test="@org.ruoyi.helper.DataBaseHelper@isOracle()">
-            select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time
-            from user_tables dt, user_tab_comments dtc, user_objects uo
-            where dt.table_name = dtc.table_name
-            and dt.table_name = uo.object_name
-            and uo.object_type = 'TABLE'
-            AND dt.table_name NOT LIKE 'XXL_JOB_%' AND dt.table_name NOT LIKE 'GEN_%'
-            AND lower(dt.table_name) NOT IN (select table_name from gen_table)
-            <if test="genTable.tableName != null and genTable.tableName != ''">
-                AND lower(dt.table_name) like lower(concat(concat('%', #{genTable.tableName}), '%'))
-            </if>
-            <if test="genTable.tableComment != null and genTable.tableComment != ''">
-                AND lower(dtc.comments) like lower(concat(concat('%', #{genTable.tableComment}), '%'))
-            </if>
-            order by create_time desc
-        </if>
-        <if test="@org.ruoyi.helper.DataBaseHelper@isPostgerSql()">
-            select table_name, table_comment, create_time, update_time
-            from (
-                SELECT c.relname AS table_name,
-                        obj_description(c.oid) AS table_comment,
-                        CURRENT_TIMESTAMP AS create_time,
-                        CURRENT_TIMESTAMP AS update_time
-                FROM pg_class c
-                    LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
-                WHERE (c.relkind = ANY (ARRAY ['r'::"char", 'p'::"char"]))
-                    AND c.relname != 'spatial_%'::text
-                    AND n.nspname = 'public'::name
-                    AND n.nspname <![CDATA[ <> ]]> ''::name
-            ) list_table
-            where table_name NOT LIKE 'xxl_job_%' AND table_name NOT LIKE 'gen_%'
-            AND table_name NOT IN (select table_name from gen_table)
-            <if test="genTable.tableName != null and genTable.tableName != ''">
-                AND lower(table_name) like lower(concat('%', #{genTable.tableName}, '%'))
-            </if>
-            <if test="genTable.tableComment != null and genTable.tableComment != ''">
-                AND lower(table_comment) like lower(concat('%', #{genTable.tableComment}, '%'))
-            </if>
-            order by create_time desc
-        </if>
-        <if test="@org.ruoyi.helper.DataBaseHelper@isSqlServer()">
-            SELECT cast(D.NAME as nvarchar) as table_name,
-                   cast(F.VALUE as nvarchar) as table_comment,
-                   crdate as create_time,
-                   refdate as update_time
-            FROM SYSOBJECTS D
-                INNER JOIN SYS.EXTENDED_PROPERTIES F ON D.ID = F.MAJOR_ID
-                    AND F.MINOR_ID = 0 AND D.XTYPE = 'U' AND D.NAME != 'DTPROPERTIES'
-                    AND D.NAME NOT LIKE 'xxl_job_%' AND D.NAME NOT LIKE 'gen_%'
-                    AND D.NAME NOT IN (select table_name from gen_table)
-            <if test="genTable.tableName != null and genTable.tableName != ''">
-                AND lower(D.NAME) like lower(concat(N'%', N'${genTable.tableName}', N'%'))
-            </if>
-            <if test="genTable.tableComment != null and genTable.tableComment != ''">
-                AND lower(CAST(F.VALUE AS nvarchar)) like lower(concat(N'%', N'${genTable.tableComment}', N'%'))
-            </if>
-            order by crdate desc
-        </if>
-    </select>
-
-    <select id="selectDbTableListByNames" resultMap="GenTableResult">
-        <if test="@org.ruoyi.helper.DataBaseHelper@isMySql()">
-            select table_name, table_comment, create_time, update_time from information_schema.tables
-            where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
-            and table_name in
-            <foreach collection="array" item="name" open="(" separator="," close=")">
-                 #{name}
-            </foreach>
-        </if>
-        <if test="@org.ruoyi.helper.DataBaseHelper@isOracle()">
-            select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time
-            from user_tables dt, user_tab_comments dtc, user_objects uo
-            where dt.table_name = dtc.table_name
-            and dt.table_name = uo.object_name
-            and uo.object_type = 'TABLE'
-            AND dt.table_name NOT LIKE 'XXL_JOB_%' AND dt.table_name NOT LIKE 'GEN_%'
-            AND dt.table_name NOT IN (select table_name from gen_table)
-            and lower(dt.table_name) in
-            <foreach collection="array" item="name" open="(" separator="," close=")">
-                #{name}
-            </foreach>
-        </if>
-        <if test="@org.ruoyi.helper.DataBaseHelper@isPostgerSql()">
-            select table_name, table_comment, create_time, update_time
-            from (
-                SELECT c.relname AS table_name,
-                        obj_description(c.oid) AS table_comment,
-                        CURRENT_TIMESTAMP AS create_time,
-                        CURRENT_TIMESTAMP AS update_time
-                FROM pg_class c
-                    LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
-                WHERE (c.relkind = ANY (ARRAY ['r'::"char", 'p'::"char"]))
-                    AND c.relname != 'spatial_%'::text
-                    AND n.nspname = 'public'::name
-                    AND n.nspname <![CDATA[ <> ]]> ''::name
-            ) list_table
-            where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%'
-            and table_name in
-            <foreach collection="array" item="name" open="(" separator="," close=")">
-                #{name}
-            </foreach>
-        </if>
-        <if test="@org.ruoyi.helper.DataBaseHelper@isSqlServer()">
-            SELECT cast(D.NAME as nvarchar) as table_name,
-                   cast(F.VALUE as nvarchar) as table_comment,
-                   crdate as create_time,
-                   refdate as update_time
-            FROM SYSOBJECTS D
-                INNER JOIN SYS.EXTENDED_PROPERTIES F ON D.ID = F.MAJOR_ID
-                    AND F.MINOR_ID = 0 AND D.XTYPE = 'U' AND D.NAME != 'DTPROPERTIES'
-                    AND D.NAME NOT LIKE 'xxl_job_%' AND D.NAME NOT LIKE 'gen_%'
-                    AND D.NAME in
-            <foreach collection="array" item="name" open="(" separator="," close=")">
-                #{name}
-            </foreach>
-        </if>
-    </select>
-
-    <select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
-        <if test="@org.ruoyi.helper.DataBaseHelper@isMySql()">
-            select table_name, table_comment, create_time, update_time from information_schema.tables
-            where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
-            and table_name = #{tableName}
-        </if>
-        <if test="@org.ruoyi.helper.DataBaseHelper@isOracle()">
-            select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time
-            from user_tables dt, user_tab_comments dtc, user_objects uo
-            where dt.table_name = dtc.table_name
-            and dt.table_name = uo.object_name
-            and uo.object_type = 'TABLE'
-            AND dt.table_name NOT LIKE 'XXL_JOB_%' AND dt.table_name NOT LIKE 'GEN_%'
-            AND dt.table_name NOT IN (select table_name from gen_table)
-            and lower(dt.table_name) = #{tableName}
-        </if>
-        <if test="@org.ruoyi.helper.DataBaseHelper@isPostgerSql()">
-            select table_name, table_comment, create_time, update_time
-            from (
-                SELECT c.relname AS table_name,
-                        obj_description(c.oid) AS table_comment,
-                        CURRENT_TIMESTAMP AS create_time,
-                        CURRENT_TIMESTAMP AS update_time
-                FROM pg_class c
-                    LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
-                WHERE (c.relkind = ANY (ARRAY ['r'::"char", 'p'::"char"]))
-                    AND c.relname != 'spatial_%'::text
-                    AND n.nspname = 'public'::name
-                    AND n.nspname <![CDATA[ <> ]]> ''::name
-            ) list_table
-            where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%'
-            and table_name = #{tableName}
-        </if>
-        <if test="@org.ruoyi.helper.DataBaseHelper@isSqlServer()">
-            SELECT cast(D.NAME as nvarchar) as table_name,
-                   cast(F.VALUE as nvarchar) as table_comment,
-                   crdate as create_time,
-                   refdate as update_time
-            FROM SYSOBJECTS D
-                INNER JOIN SYS.EXTENDED_PROPERTIES F ON D.ID = F.MAJOR_ID
-                    AND F.MINOR_ID = 0 AND D.XTYPE = 'U' AND D.NAME != 'DTPROPERTIES'
-                    AND D.NAME NOT LIKE 'xxl_job_%' AND D.NAME NOT LIKE 'gen_%'
-                    AND D.NAME = #{tableName}
-        </if>
-    </select>
 
     <select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
-        SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+        SELECT t.table_id,
-               c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+               t.table_name,
-        FROM gen_table t
+               t.table_comment,
-             LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+               t.sub_table_name,
-        where t.table_id = #{tableId} order by c.sort
+               t.sub_table_fk_name,
-    </select>
+               t.class_name,
-
+               t.tpl_category,
-    <select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
+               t.package_name,
-        SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+               t.module_name,
-               c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+               t.business_name,
-        FROM gen_table t
+               t.function_name,
-             LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+               t.function_author,
-        where t.table_name = #{tableName} order by c.sort
+               t.gen_type,
-    </select>
+               t.gen_path,
-
+               t.options,
-    <select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
+               t.remark,
-        SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
+               c.column_id,
-               c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+               c.column_name,
+               c.column_comment,
+               c.column_type,
+               c.java_type,
+               c.java_field,
+               c.is_pk,
+               c.is_increment,
+               c.is_required,
+               c.is_insert,
+               c.is_edit,
+               c.is_list,
+               c.is_query,
+               c.query_type,
+               c.html_type,
+               c.dict_type,
+               c.sort
         FROM gen_table t
                  LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+        where t.table_id = #{tableId}
         order by c.sort
     </select>
 
+
 </mapper>

ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm

@@ -21,28 +21,28 @@ import ${import};
 @AutoMapper(target = ${ClassName}.class, reverseConvertGenerate = false)
 public class ${ClassName}Bo extends BaseEntity {
 
-#foreach ($column in $columns)
+    #foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit))
+        #if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit))
             /**
              * $column.columnComment
              */
-#if($column.insert && $column.edit)
+            #if($column.insert && $column.edit)
-#set($Group="AddGroup.class, EditGroup.class")
+                #set($Group="AddGroup.class, EditGroup.class")
-#elseif($column.insert)
+            #elseif($column.insert)
-#set($Group="AddGroup.class")
+                #set($Group="AddGroup.class")
-#elseif($column.edit)
+            #elseif($column.edit)
-#set($Group="EditGroup.class")
+                #set($Group="EditGroup.class")
-#end
+            #end
-#if($column.required)
+            #if($column.required)
-#if($column.javaType == 'String')
+                #if($column.javaType == 'String')
                 @NotBlank(message = "$column.columnComment不能为空", groups = { $Group })
-#else
+                #else
                 @NotNull(message = "$column.columnComment不能为空", groups = { $Group })
-#end
+                #end
-#end
+            #end
         private $column.javaType $column.javaField;
 
-#end
+        #end
-#end
+    #end
 
 }

ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -39,21 +39,21 @@ public class ${ClassName}Controller extends BaseController {
 
     private final I${ClassName}Service ${className}Service;
 
-    /**
+/**
  * 查询${functionName}列表
  */
-    @SaCheckPermission("${permissionPrefix}:list")
+@SaCheckPermission("${permissionPrefix}:list")
-    @GetMapping("/list")
+@GetMapping("/list")
-#if($table.crud || $table.sub)
+    #if($table.crud || $table.sub)
     public TableDataInfo<${ClassName}Vo> list(${ClassName}Bo bo, PageQuery pageQuery) {
         return ${className}Service.queryPageList(bo, pageQuery);
     }
-#elseif($table.tree)
+    #elseif($table.tree)
         public R<List<${ClassName}Vo>> list(${ClassName}Bo bo) {
             List<${ClassName}Vo> list = ${className}Service.queryList(bo);
             return R.ok(list);
         }
-#end
+    #end
 
     /**
      * 导出${functionName}列表

ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -1,20 +1,20 @@
 package ${packageName}.domain;
 
-#foreach ($column in $columns)
+    #foreach ($column in $columns)
-#if($column.javaField=='tenantId')
+        #if($column.javaField=='tenantId')
-#set($IsTenant=1)
+            #set($IsTenant=1)
-#end
+        #end
-#end
+    #end
-#if($IsTenant==1)
+    #if($IsTenant==1)
-import core.tenant.common.org.ruoyi.TenantEntity;
+    import core.tenant.common.org.ruoyi.TenantEntity;
-#else
+    #else
-#end
+    #end
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-#foreach ($import in $importList)
+    #foreach ($import in $importList)
-import ${import};
+    import ${import};
-#end
+    #end
 
 import java.io.Serial;
 
@@ -25,35 +25,35 @@ import java.io.Serial;
  * @date ${datetime}
  */
 #if($IsTenant==1)
-#set($Entity="TenantEntity")
+    #set($Entity="TenantEntity")
 #else
-#set($Entity="BaseEntity")
+    #set($Entity="BaseEntity")
 #end
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("${tableName}")
 public class ${ClassName} extends ${Entity} {
 
-    @Serial
+@Serial
-    private static final long serialVersionUID = 1L;
+private static final long serialVersionUID=1L;
 
 #foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
+    #if(!$table.isSuperColumn($column.javaField))
     /**
      * $column.columnComment
      */
-#if($column.javaField=='delFlag')
+        #if($column.javaField=='delFlag')
         @TableLogic
-#end
+        #end
-#if($column.javaField=='version')
+        #if($column.javaField=='version')
         @Version
-#end
+        #end
-#if($column.isPk==1)
+        #if($column.isPk==1)
         @TableId(value = "$column.columnName")
-#end
+        #end
     private $column.javaType $column.javaField;
 
-#end
+    #end
 #end
 
 }

ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm

@@ -3,10 +3,10 @@ package ${packageName}.service;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.domain.vo.${ClassName}Vo;
 import ${packageName}.domain.bo.${ClassName}Bo;
-#if($table.crud || $table.sub)
+    #if($table.crud || $table.sub)
-import org.ruoyi.core.page.TableDataInfo;
+    import org.ruoyi.core.page.TableDataInfo;
-import org.ruoyi.core.page.PageQuery;
+    import org.ruoyi.core.page.PageQuery;
-#end
+    #end
 
 import java.util.Collection;
 import java.util.List;
@@ -24,12 +24,12 @@ public interface I${ClassName}Service {
      */
         ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
 
-#if($table.crud || $table.sub)
+    #if($table.crud || $table.sub)
         /**
          * 查询${functionName}列表
          */
         TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery);
-#end
+    #end
 
     /**
      * 查询${functionName}列表

ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -2,10 +2,10 @@ package ${packageName}.service.impl;
 
 import org.ruoyi.common.core.utils.MapstructUtils;
     #if($table.crud || $table.sub)
-import org.ruoyi.core.page.TableDataInfo;
+    import org.ruoyi.core.page.TableDataInfo;
-import org.ruoyi.core.page.PageQuery;
+    import org.ruoyi.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+    import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-#end
+    #end
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
@@ -36,11 +36,11 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
      * 查询${functionName}
      */
     @Override
-    public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}){
+    public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}) {
         return baseMapper.selectVoById(${pkColumn.javaField});
     }
 
-#if($table.crud || $table.sub)
+    #if($table.crud || $table.sub)
         /**
          * 查询${functionName}列表
          */
@@ -50,7 +50,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
             Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
             return TableDataInfo.build(result);
         }
-#end
+    #end
 
     /**
      * 查询${functionName}列表
@@ -64,27 +64,27 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
-#foreach($column in $columns)
+        #foreach($column in $columns)
-#if($column.query)
+            #if($column.query)
-#set($queryType=$column.queryType)
+                #set($queryType=$column.queryType)
-#set($javaField=$column.javaField)
+                #set($javaField=$column.javaField)
-#set($javaType=$column.javaType)
+                #set($javaType=$column.javaType)
-#set($columnName=$column.columnName)
+                #set($columnName=$column.columnName)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($mpMethod=$column.queryType.toLowerCase())
+                #set($mpMethod=$column.queryType.toLowerCase())
-#if($queryType != 'BETWEEN')
+                #if($queryType != 'BETWEEN')
-#if($javaType == 'String')
+                    #if($javaType == 'String')
-#set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())')
+                        #set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())')
-#else
+                    #else
-#set($condition='bo.get'+$AttrName+'() != null')
+                        #set($condition='bo.get'+$AttrName+'() != null')
-#end
+                    #end
                     lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName());
-#else
+                #else
                     lqw.between(params.get("begin$AttrName") != null && params.get("end$AttrName") != null,
-            ${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName"));
+                        ${ClassName}::get$AttrName , params.get("begin$AttrName"), params.get("end$AttrName"));
-#end
+                #end
-#end
+            #end
-#end
+        #end
         return lqw;
     }
 
@@ -93,10 +93,10 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
      */
     @Override
     public Boolean insertByBo(${ClassName}Bo bo) {
-        ${ClassName} add = MapstructUtils.convert(bo, ${ClassName}.class);
+        ${ClassName} add = MapstructUtils.convert(bo, ${ClassName}. class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
-#set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
+        #set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
         if (flag) {
             bo.set$pk(add.get$pk());
         }
@@ -108,7 +108,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
      */
     @Override
     public Boolean updateByBo(${ClassName}Bo bo) {
-        ${ClassName} update = MapstructUtils.convert(bo, ${ClassName}.class);
+        ${ClassName} update = MapstructUtils.convert(bo, ${ClassName}. class);
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
@@ -116,7 +116,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(${ClassName} entity){
+    private void validEntityBeforeSave(${ClassName} entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -125,7 +125,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;

ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm

@@ -1,8 +1,8 @@
 package ${packageName}.domain.vo;
 
-#foreach ($import in $importList)
+    #foreach ($import in $importList)
-import ${import};
+    import ${import};
-#end
+    #end
 import ${packageName}.domain.${ClassName};
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -16,7 +16,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
  * ${functionName}视图对象 ${tableName}
  *
@@ -31,29 +30,29 @@ public class ${ClassName}Vo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-#foreach ($column in $columns)
+    #foreach ($column in $columns)
-#if($column.list)
+        #if($column.list)
             /**
              * $column.columnComment
              */
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
+            #set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
+            #if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
+            #else
-#set($comment=$column.columnComment)
+                #set($comment=$column.columnComment)
-#end
+            #end
-#if(${column.dictType} && ${column.dictType} != '')
+            #if(${column.dictType} && ${column.dictType} != '')
             @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
             @ExcelDictFormat(dictType = "${column.dictType}")
-#elseif($parentheseIndex != -1)
+            #elseif($parentheseIndex != -1)
             @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
             @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
-#else
+            #else
             @ExcelProperty(value = "${comment}")
-#end
+            #end
         private $column.javaType $column.javaField;
 
-#end
+        #end
-#end
+    #end
 
 }

ruoyi-modules/ruoyi-generator/src/main/resources/vm/js/api.js.vm

@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询${functionName}列表
-export function list${BusinessName}(query) {
-  return request({
-    url: '/${moduleName}/${businessName}/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询${functionName}详细
-export function get${BusinessName}(${pkColumn.javaField}) {
-  return request({
-    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
-    method: 'get'
-  })
-}
-
-// 新增${functionName}
-export function add${BusinessName}(data) {
-  return request({
-    url: '/${moduleName}/${businessName}',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改${functionName}
-export function update${BusinessName}(data) {
-  return request({
-    url: '/${moduleName}/${businessName}',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除${functionName}
-export function del${BusinessName}(${pkColumn.javaField}) {
-  return request({
-    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
-    method: 'delete'
-  })
-}

ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm

@@ -1,63 +0,0 @@
-import request from '@/utils/request';
-import {AxiosPromise} from 'axios';
-import {${BusinessName}Form, ${BusinessName}Query, ${BusinessName}VO} from '@/api/';
-
-/**
- * 查询${functionName}列表
- * @param query
- * @returns {*}
- */
-
-export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<${BusinessName}VO[]> => {
-  return request({
-    url: '/${moduleName}/${businessName}/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询${functionName}详细
- * @param ${pkColumn.javaField}
- */
-export const get${BusinessName} = (${pkColumn.javaField}: string | number): AxiosPromise<${BusinessName}VO> => {
-  return request({
-    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
-    method: 'get'
-  });
-};
-
-/**
- * 新增${functionName}
- * @param data
- */
-export const add${BusinessName} = (data: ${BusinessName}Form) => {
-  return request({
-    url: '/${moduleName}/${businessName}',
-    method: 'post',
-    data: data
-  });
-};
-
-/**
- * 修改${functionName}
- * @param data
- */
-export const update${BusinessName} = (data: ${BusinessName}Form) => {
-  return request({
-    url: '/${moduleName}/${businessName}',
-    method: 'put',
-    data: data
-  });
-};
-
-/**
- * 删除${functionName}
- * @param ${pkColumn.javaField}
- */
-export const del${BusinessName} = (${pkColumn.javaField}: string | number | Array<string | number>) => {
-  return request({
-    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
-    method: 'delete'
-  });
-};

ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm

@@ -1,44 +0,0 @@
-export interface ${BusinessName}VO {
-#foreach ($column in $columns)
-#if($column.insert || $column.edit)
-  /**
-   * $column.columnComment
-   */
-  $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
-                        #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
-                        #elseif($column.javaType == 'Boolean') boolean;
-                        #else string;
-                    #end
-#end
-#end
-}
-
-export interface ${BusinessName}Form extends BaseEntity {
-#foreach ($column in $columns)
-#if($column.insert || $column.edit)
-  /**
-   * $column.columnComment
-   */
-  $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
-                        #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
-                        #elseif($column.javaType == 'Boolean') boolean;
-                        #else string;
-                    #end
-#end
-#end
-}
-
-export interface ${BusinessName}Query #if(!${treeCode})extends PageQuery #end{
-#foreach ($column in $columns)
-#if($column.query)
-  /**
-   * $column.columnComment
-   */
-  $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number;
-                        #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
-                        #elseif($column.javaType == 'Boolean') boolean;
-                        #else string;
-                    #end
-#end
-#end
-}

ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -1,475 +0,0 @@
-<template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div class="search" v-show="showSearch">
-        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input" || $column.htmlType == "textarea")
-          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
-          </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
-          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-              <el-option
-                v-for="dict in ${dictType}"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
-          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-              <el-option label="请选择字典生成" value="" />
-            </el-select>
-          </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
-          <el-form-item label="${comment}" prop="${column.javaField}">
-            <el-date-picker clearable
-              v-model="queryParams.${column.javaField}"
-              type="date"
-              value-format="YYYY-MM-DD"
-              placeholder="请选择${comment}"
-            />
-          </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-          <el-form-item label="${comment}" style="width: 308px">
-            <el-date-picker
-                v-model="daterange${AttrName}"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            />
-          </el-form-item>
-#end
-#end
-#end
-          <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </transition>
-
-    <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['${moduleName}:${businessName}:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['${moduleName}:${businessName}:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
-        <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="${column.list}" />
-#elseif($column.list && $column.htmlType == "datetime")
-        <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
-        <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
-          <template #default="scope">
-            <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
-          </template>
-        </el-table-column>
-#elseif($column.list && $column.dictType && "" != $column.dictType)
-        <el-table-column label="${comment}" align="center" prop="${javaField}">
-          <template #default="scope">
-#if($column.htmlType == "checkbox")
-            <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
-            <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
-#end
-          </template>
-        </el-table-column>
-#elseif($column.list && "" != $javaField)
-        <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']"></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-          v-show="total>0"
-          :total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-      />
-    </el-card>
-    <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="${businessName}FormRef" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-        </el-form-item>
-#elseif($column.htmlType == "imageUpload")
-        <el-form-item label="${comment}" prop="${field}">
-          <image-upload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "fileUpload")
-        <el-form-item label="${comment}" prop="${field}">
-          <file-upload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "editor")
-        <el-form-item label="${comment}">
-          <editor v-model="form.${field}" :min-height="192"/>
-        </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-            <el-option
-                v-for="dict in ${dictType}"
-                :key="dict.value"
-                :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-                :value="parseInt(dict.value)"
-#else
-                :value="dict.value"
-#end
-            ></el-option>
-          </el-select>
-        </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox
-                v-for="dict in ${dictType}"
-                :key="dict.value"
-                :label="dict.value">
-                {{dict.label}}
-            </el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox>请选择字典生成</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio
-                v-for="dict in ${dictType}"
-                :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-                :label="parseInt(dict.value)"
-#else
-                :label="dict.value"
-#end
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-                <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "datetime")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-date-picker clearable
-            v-model="form.${field}"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择${comment}">
-          </el-date-picker>
-        </el-form-item>
-#elseif($column.htmlType == "textarea")
-        <el-form-item label="${comment}" prop="${field}">
-            <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-#end
-#end
-#end
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup name="${BusinessName}" lang="ts">
-  import {
-    add${BusinessName},
-          ${BusinessName}Form,
-    get${BusinessName},
-    list${BusinessName},
-          ${BusinessName}Query,
-    update${BusinessName},
-          ${BusinessName}VO
-  } from '@/api/';
-  import {ComponentInternalInstance} from 'vue';
-  import {ElForm} from 'element-plus';
-
-  const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = toRefs<any>(proxy?.useDict(${dicts}));
-#end
-
-const ${businessName}List = ref<${BusinessName}VO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-const daterange${AttrName} = ref([]);
-#end
-#end
-
-const queryFormRef = ref(ElForm);
-const ${businessName}FormRef = ref(ElForm);
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: ${BusinessName}Form = {
-#foreach ($column in $columns)
-#if($column.insert || $column.edit)
-#if($column.htmlType == "checkbox")
-  $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
-  $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-#end
-#end
-#end
-}
-const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
-  form: {...initFormData},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-#foreach ($column in $columns)
-#if($column.query)
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-#end
-#end
-  },
-  rules: {
-#foreach ($column in $columns)
-#if($column.insert || $column.edit)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-    $column.javaField: [
-      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
-    ]#if($foreach.count != $columns.size()),#end
-#end
-#end
-#end
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询${functionName}列表 */
-const getList = async () => {
-  loading.value = true;
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-  queryParams.value.params = {};
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  if (null != daterange${AttrName} && '' != daterange${AttrName}) {
-    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0];
-    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1];
-  }
-#end
-#end
-  const res = await list${BusinessName}(queryParams.value);
-  ${businessName}List.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-}
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-}
-
-/** 表单重置 */
-const reset = () => {
-  form.value = {...initFormData};
-  ${businessName}FormRef.value.resetFields();
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  daterange${AttrName}.value = [];
-#end
-#end
-  queryFormRef.value.resetFields();
-  handleQuery();
-}
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: ${BusinessName}VO[]) => {
-  ids.value = selection.map(item => item.${pkColumn.javaField});
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-}
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  dialog.visible = true;
-  dialog.title = "添加${functionName}";
-  nextTick(() => {
-    reset();
-  });
-}
-
-/** 修改按钮操作 */
-const handleUpdate = (row?: ${BusinessName}VO) => {
-  loading.value = true
-  dialog.visible = true;
-  dialog.title = "修改${functionName}";
-  nextTick(async () => {
-    reset();
-    const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0]
-    const res = await get${BusinessName}(_${pkColumn.javaField});
-    loading.value = false;
-    Object.assign(form.value, res.data);
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-    form.value.$column.javaField = form.value.${column.javaField}.split(",");
-#end
-#end
-  });
-}
-
-/** 提交按钮 */
-const submitForm = () => {
-  ${businessName}FormRef.value.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      #foreach ($column in $columns)
-        #if($column.htmlType == "checkbox")
-        form.value.$column.javaField = form.value.${column.javaField}.join(",");
-        #end
-      #end
-      if (form.value.${pkColumn.javaField}) {
-        await update${BusinessName}(form.value).finally(() =>  buttonLoading.value = false);
-      } else {
-        await add${BusinessName}(form.value).finally(() =>  buttonLoading.value = false);
-      }
-      proxy?.#[[$modal]]#.msgSuccess("修改成功");
-      dialog.visible = false;
-      await getList();
-    }
-  });
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (row?: ${BusinessName}VO) => {
-  const _${pkColumn.javaField}s = row?.${pkColumn.javaField} || ids.value;
-  await proxy?.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项？').finally(() => loading.value = false);
-  await del${BusinessName}(_${pkColumn.javaField}s);
-  proxy?.#[[$modal]]#.msgSuccess("删除成功");
-  await getList();
-}
-
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download('${moduleName}/${businessName}/export', {
-    ...queryParams.value
-  }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
-}
-
-onMounted(() => {
-  getList();
-});
-</script>

ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="${packageName}.mapper.${ClassName}Mapper">
 
 </mapper>