From 418863cf5c2b0ddcd0de74cd7e1f19697b3f2403 Mon Sep 17 00:00:00 2001 From: dy <1197793912@qq.com> Date: Wed, 24 Mar 2021 16:58:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 4 + .../src/main/resources/generator.yml | 11 - .../mapper/generator/GenTableColumnMapper.xml | 127 ---- .../mapper/generator/GenTableMapper.xml | 189 ------ .../resources/templates/tool/gen/edit.html | 607 ------------------ .../resources/templates/tool/gen/gen.html | 209 ------ .../templates/tool/gen/importTable.html | 101 --- 7 files changed, 4 insertions(+), 1244 deletions(-) delete mode 100644 sino-activity/src/main/resources/generator.yml delete mode 100644 sino-activity/src/main/resources/mapper/generator/GenTableColumnMapper.xml delete mode 100644 sino-activity/src/main/resources/mapper/generator/GenTableMapper.xml delete mode 100644 sino-activity/src/main/resources/templates/tool/gen/edit.html delete mode 100644 sino-activity/src/main/resources/templates/tool/gen/gen.html delete mode 100644 sino-activity/src/main/resources/templates/tool/gen/importTable.html diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 58df34fc3..eaa81b2fc 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -78,6 +78,10 @@ com.ruoyi ruoyi-generator + + com.ruoyi + sino-activity + diff --git a/sino-activity/src/main/resources/generator.yml b/sino-activity/src/main/resources/generator.yml deleted file mode 100644 index 8e3224e70..000000000 --- a/sino-activity/src/main/resources/generator.yml +++ /dev/null @@ -1,11 +0,0 @@ - -# 代码生成 -gen: - # 作者 - author: ruoyi - # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.system - # 自动去除表前缀，默认是false - autoRemovePre: false - # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） - tablePrefix: sys_ \ No newline at end of file diff --git a/sino-activity/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/sino-activity/src/main/resources/mapper/generator/GenTableColumnMapper.xml deleted file mode 100644 index 86f62deda..000000000 --- a/sino-activity/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column - - - - - - - - insert into gen_table_column ( - table_id, - column_name, - column_comment, - column_type, - java_type, - java_field, - is_pk, - is_increment, - is_required, - is_insert, - is_edit, - is_list, - is_query, - query_type, - html_type, - dict_type, - sort, - create_by, - create_time - )values( - #{tableId}, - #{columnName}, - #{columnComment}, - #{columnType}, - #{javaType}, - #{javaField}, - #{isPk}, - #{isIncrement}, - #{isRequired}, - #{isInsert}, - #{isEdit}, - #{isList}, - #{isQuery}, - #{queryType}, - #{htmlType}, - #{dictType}, - #{sort}, - #{createBy}, - sysdate() - ) - - - - update gen_table_column - - column_comment = #{columnComment}, - java_type = #{javaType}, - java_field = #{javaField}, - is_insert = #{isInsert}, - is_edit = #{isEdit}, - is_list = #{isList}, - is_query = #{isQuery}, - is_required = #{isRequired}, - query_type = #{queryType}, - html_type = #{htmlType}, - dict_type = #{dictType}, - sort = #{sort}, - update_by = #{updateBy}, - update_time = sysdate() - - where column_id = #{columnId} - - - - delete from gen_table_column where table_id in - - #{tableId} - - - - - delete from gen_table_column where column_id in - - #{item.columnId} - - - - \ No newline at end of file diff --git a/sino-activity/src/main/resources/mapper/generator/GenTableMapper.xml b/sino-activity/src/main/resources/mapper/generator/GenTableMapper.xml deleted file mode 100644 index 6f72255a3..000000000 --- a/sino-activity/src/main/resources/mapper/generator/GenTableMapper.xml +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table - - - - - - - - - - - - - - - - - - insert into gen_table ( - table_name, - table_comment, - class_name, - tpl_category, - package_name, - module_name, - business_name, - function_name, - function_author, - gen_type, - gen_path, - remark, - create_by, - create_time - )values( - #{tableName}, - #{tableComment}, - #{className}, - #{tplCategory}, - #{packageName}, - #{moduleName}, - #{businessName}, - #{functionName}, - #{functionAuthor}, - #{genType}, - #{genPath}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - update gen_table - - table_name = #{tableName}, - table_comment = #{tableComment}, - sub_table_name = #{subTableName}, - sub_table_fk_name = #{subTableFkName}, - class_name = #{className}, - function_author = #{functionAuthor}, - gen_type = #{genType}, - gen_path = #{genPath}, - tpl_category = #{tplCategory}, - package_name = #{packageName}, - module_name = #{moduleName}, - business_name = #{businessName}, - function_name = #{functionName}, - options = #{options}, - update_by = #{updateBy}, - remark = #{remark}, - update_time = sysdate() - - where table_id = #{tableId} - - - - delete from gen_table where table_id in - - #{tableId} - - - - \ No newline at end of file diff --git a/sino-activity/src/main/resources/templates/tool/gen/edit.html b/sino-activity/src/main/resources/templates/tool/gen/edit.html deleted file mode 100644 index 72f057ac3..000000000 --- a/sino-activity/src/main/resources/templates/tool/gen/edit.html +++ /dev/null @@ -1,607 +0,0 @@ - - - - - - - - -
-
-
-
-
-
- -
- -
- -
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- - -
-
-
-
-
- - -
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
- -
- -
- - -
-
-
-
-
-
-
-
- -
- - -
-
-
-
- - - -
-
-
-
-
-
-
-   - -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - diff --git a/sino-activity/src/main/resources/templates/tool/gen/gen.html b/sino-activity/src/main/resources/templates/tool/gen/gen.html deleted file mode 100644 index bbb9ae0c5..000000000 --- a/sino-activity/src/main/resources/templates/tool/gen/gen.html +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - 表名称： -
    • -
  • - 表描述： -
    • -
  • - - - - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - - -
-
-
-
-
- - - - - - \ No newline at end of file diff --git a/sino-activity/src/main/resources/templates/tool/gen/importTable.html b/sino-activity/src/main/resources/templates/tool/gen/importTable.html deleted file mode 100644 index f5d04b787..000000000 --- a/sino-activity/src/main/resources/templates/tool/gen/importTable.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - -
-
-
-
-
- -
-
-
- -
-
-
-
-
- - - - \ No newline at end of file