From d3a5eee19d0df63ee4ffa719ed9bdcbaeae9e2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Tue, 20 Jul 2021 23:54:40 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BB=A3=E7=A0=81=E6=97=B6=E5=8F=AF=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=8C=85=E6=8B=AC=E7=9A=84=E8=8F=9C=E5=8D=95=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _web/src/views/gen/codeGenerate/addForm.vue | 72 ------------------ _web/src/views/gen/codeGenerate/editForm.vue | 76 +------------------ .../core/context/XnVelocityContext.java | 4 - .../generate/core/param/XnCodeGenParam.java | 15 ---- .../generate/modular/entity/CodeGenerate.java | 11 --- .../modular/param/CodeGenerateParam.java | 12 --- .../service/impl/CodeGenerateServiceImpl.java | 6 -- .../main/resources/template/XnMysql.sql.vm | 16 ++-- .../main/resources/template/XnOracle.sql.vm | 16 ++-- 9 files changed, 17 insertions(+), 211 deletions(-) diff --git a/_web/src/views/gen/codeGenerate/addForm.vue b/_web/src/views/gen/codeGenerate/addForm.vue index 3430635a..ae9dfa6a 100644 --- a/_web/src/views/gen/codeGenerate/addForm.vue +++ b/_web/src/views/gen/codeGenerate/addForm.vue @@ -79,40 +79,6 @@ - - - - - {{ item.name }} - - - - - - - {{ id }} - - - - - import { codeGenerateInformationList, codeGenerateAdd } from '@/api/modular/gen/codeGenerateManage' - import { getAppList } from '@/api/modular/system/appManage' - import { getMenuTree } from '@/api/modular/system/menuManage' export default { data () { return { @@ -163,8 +127,6 @@ tablePrefixValue: 'N', tableNameValue: '', packageNameShow: true, - appData: [], - menuTreeData: [], form: this.$form.createForm(this) } }, @@ -175,7 +137,6 @@ this.codeGenerateInformationList() this.dataTypeItem() this.selectedByDefault() - this.getSysApplist() }, /** * 默认选中项 @@ -184,7 +145,6 @@ this.form.getFieldDecorator('packageName', { initialValue: 'vip.xiaonuo' }) this.form.getFieldDecorator('tablePrefix', { valuePropName: 'checked', initialValue: 'N' }) this.form.getFieldDecorator('generateType', { valuePropName: 'checked', initialValue: '1' }) - this.tablePrefixValue = 'N' }, /** * 获得所有数据库的表 @@ -194,38 +154,6 @@ this.tableNameData = res.data }) }, - /** - * 获取应用列表 - */ - getSysApplist () { - return getAppList().then((res) => { - if (res.success) { - this.appData = res.data - } else { - this.$message.warning(res.message) - } - }) - }, - /** - * 通过应用获取菜单 - */ - changeApplication (value) { - this.form.resetFields(`menuPid`, []) - getMenuTree({ 'application': value }).then((res) => { - if (res.success) { - this.menuTreeData = [{ - 'id': '-1', - 'parentId': '0', - 'title': '顶级', - 'value': '0', - 'pid': '0', - 'children': res.data - }] - } else { - this.$message.warning(res.message) - } - }) - }, /** * 获取字典数据 */ diff --git a/_web/src/views/gen/codeGenerate/editForm.vue b/_web/src/views/gen/codeGenerate/editForm.vue index 3843845a..96dc3553 100644 --- a/_web/src/views/gen/codeGenerate/editForm.vue +++ b/_web/src/views/gen/codeGenerate/editForm.vue @@ -80,40 +80,6 @@ - - - - - {{ item.name }} - - - - - - - {{ id }} - - - - - import { codeGenerateInformationList, codeGenerateEdit } from '@/api/modular/gen/codeGenerateManage' - import { getAppList } from '@/api/modular/system/appManage' - import { getMenuTree } from '@/api/modular/system/menuManage' export default { data () { return { @@ -164,8 +128,6 @@ tablePrefixValue: 'N', tableNameValue: '', packageNameShow: true, - appData: [], - menuTreeData: [], form: this.$form.createForm(this) } }, @@ -175,7 +137,6 @@ this.visible = true this.codeGenerateInformationList() this.dataTypeItem() - this.getSysApplist() setTimeout(() => { this.form.setFieldsValue( { @@ -187,13 +148,10 @@ busName: record.busName, generateType: record.generateType, authorName: record.authorName, - packageName: record.packageName, - appCode: record.appCode, - menuPid: record.menuPid + packageName: record.packageName } ) }, 100) - this.changeApplication(record.appCode) this.tableNameValue = record.tableName this.tablePrefixValue = record.tablePrefix }, @@ -205,38 +163,6 @@ this.tableNameData = res.data }) }, - /** - * 获取应用列表 - */ - getSysApplist () { - return getAppList().then((res) => { - if (res.success) { - this.appData = res.data - } else { - this.$message.warning(res.message) - } - }) - }, - /** - * 通过应用获取菜单 - */ - changeApplication (value) { - this.form.resetFields(`menuPid`, []) - getMenuTree({ 'application': value }).then((res) => { - if (res.success) { - this.menuTreeData = [{ - 'id': '-1', - 'parentId': '0', - 'title': '顶级', - 'value': '0', - 'pid': '0', - 'children': res.data - }] - } else { - this.$message.warning(res.message) - } - }) - }, /** * 获取字典数据 */ diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/context/XnVelocityContext.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/context/XnVelocityContext.java index b33fe6e8..e14e6200 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/context/XnVelocityContext.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/context/XnVelocityContext.java @@ -86,10 +86,6 @@ public class XnVelocityContext { }); velocityContext.put("queryWhetherList", codeGenerateConfigList); - velocityContext.put("appCode", xnCodeGenParam.getAppCode()); - - velocityContext.put("menuPids", xnCodeGenParam.getMenuPids() + "[" + xnCodeGenParam.getMenuPid() + "],"); - // sql中id的创建 List idList = new ArrayList<>(); for (int a = 0; a <= 7; a++) { diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/param/XnCodeGenParam.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/param/XnCodeGenParam.java index 68a8c76f..97270307 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/param/XnCodeGenParam.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/param/XnCodeGenParam.java @@ -93,19 +93,4 @@ public class XnCodeGenParam { */ private String busName; - /** - * 所属应用 - */ - private String appCode; - - /** - * 菜单上级 - */ - private String menuPid; - - /** - * 菜单上级父ids - */ - private String menuPids; - } diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/entity/CodeGenerate.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/entity/CodeGenerate.java index 4df8adb6..8cf49084 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/entity/CodeGenerate.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/entity/CodeGenerate.java @@ -86,15 +86,4 @@ public class CodeGenerate extends BaseEntity { * 功能名（数据库表名称） */ private String tableComment; - - /** - * 所属应用 - */ - private String appCode; - - /** - * 菜单上级 - */ - private String menuPid; - } diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/param/CodeGenerateParam.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/param/CodeGenerateParam.java index 802557d7..c7538b26 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/param/CodeGenerateParam.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/param/CodeGenerateParam.java @@ -96,16 +96,4 @@ public class CodeGenerateParam extends BaseParam { @NotBlank(message = "功能名不能为空，请检查tableComment参数", groups = {BaseParam.add.class, edit.class}) private String tableComment; - /** - * 所属应用 - */ - @NotBlank(message = "所属应用不能为空，请检查appCode参数", groups = {BaseParam.add.class, edit.class}) - private String appCode; - - /** - * 菜单上级 - */ - @NotBlank(message = "菜单上级不能为空，请检查menuPid参数", groups = {BaseParam.add.class, edit.class}) - private String menuPid; - } diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java index 665d8f33..636d5035 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java @@ -28,7 +28,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import org.apache.commons.io.IOUtils; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; @@ -58,7 +57,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.util.List; -import java.util.Map; import java.util.Properties; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -82,8 +80,6 @@ public class CodeGenerateServiceImpl extends ServiceImpl map = SqlRunner.db().selectOne(SELECT_SYS_MENU_SQL, codeGenerate.getMenuPid()); - param.setMenuPids(map.get("pids").toString()); return param; } diff --git a/snowy-base/snowy-gen/src/main/resources/template/XnMysql.sql.vm b/snowy-base/snowy-gen/src/main/resources/template/XnMysql.sql.vm index fd7779ca..2326ffbd 100644 --- a/snowy-base/snowy-gen/src/main/resources/template/XnMysql.sql.vm +++ b/snowy-base/snowy-gen/src/main/resources/template/XnMysql.sql.vm @@ -4,35 +4,35 @@ #foreach ($id in $sqlMenuId) #if($foreach.count == 1) INSERT INTO `sys_menu` VALUES -('$id', '0', '${menuPids}', '${functionName}', '${busName}_index', '1', null, '/${className}', 'main/${busName}/index', null, '${appCode}', '1', 'Y', null, null, '1', '100', null, '0', null, null, null, null); +('$id', '0', '[0],', '${functionName}', '${busName}_index', '1', null, '/${className}', 'main/${busName}/index', null, 'system_tool', '1', 'Y', null, null, '1', '100', null, '0', null, null, null, null); #set ($pid=$id) #elseif($foreach.count == 2) INSERT INTO `sys_menu` VALUES -('$id', '$pid', '${menuPids}[$pid],', '${functionName}查询', '${busName}_index_page', '2', null, null, null, '${className}:page', '${appCode}', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); +('$id', '$pid', '[0],[$pid],', '${functionName}查询', '${busName}_index_page', '2', null, null, null, '${className}:page', 'system_tool', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); #elseif($foreach.count == 3) INSERT INTO `sys_menu` VALUES -('$id', '$pid', '${menuPids}[$pid],', '${functionName}新增', '${busName}_index_add', '2', null, null, null, '${className}:add', '${appCode}', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); +('$id', '$pid', '[0],[$pid],', '${functionName}新增', '${busName}_index_add', '2', null, null, null, '${className}:add', 'system_tool', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); #elseif($foreach.count == 4) INSERT INTO `sys_menu` VALUES -('$id', '$pid', '${menuPids}[$pid],', '${functionName}编辑', '${busName}_index_edit', '2', null, null, null, '${className}:edit', '${appCode}', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); +('$id', '$pid', '[0],[$pid],', '${functionName}编辑', '${busName}_index_edit', '2', null, null, null, '${className}:edit', 'system_tool', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); #elseif($foreach.count == 5) INSERT INTO `sys_menu` VALUES -('$id', '$pid', '${menuPids}[$pid],', '${functionName}删除', '${busName}_index_delete', '2', null, null, null, '${className}:delete', '${appCode}', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); +('$id', '$pid', '[0],[$pid],', '${functionName}删除', '${busName}_index_delete', '2', null, null, null, '${className}:delete', 'system_tool', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); #elseif($foreach.count == 6) INSERT INTO `sys_menu` VALUES -('$id', '$pid', '${menuPids}[$pid],', '${functionName}查看', '${busName}_index_detail', '2', null, null, null, '${className}:detail', '${appCode}', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); +('$id', '$pid', '[0],[$pid],', '${functionName}查看', '${busName}_index_detail', '2', null, null, null, '${className}:detail', 'system_tool', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); #elseif($foreach.count == 7) INSERT INTO `sys_menu` VALUES -('$id', '$pid', '${menuPids}[$pid],', '${functionName}列表', '${busName}_index_list', '2', null, null, null, '${className}:list', '${appCode}', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); +('$id', '$pid', '[0],[$pid],', '${functionName}列表', '${busName}_index_list', '2', null, null, null, '${className}:list', 'system_tool', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); #elseif($foreach.count == 8) INSERT INTO `sys_menu` VALUES -('$id', '$pid', '${menuPids}[$pid],', '${functionName}导出', '${busName}_index_export', '2', null, null, null, '${className}:export', '${appCode}', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); +('$id', '$pid', '[0],[$pid],', '${functionName}导出', '${busName}_index_export', '2', null, null, null, '${className}:export', 'system_tool', '0', 'Y', null, null, '1', '100', null, '0', null, null, null, null); #end #end \ No newline at end of file diff --git a/snowy-base/snowy-gen/src/main/resources/template/XnOracle.sql.vm b/snowy-base/snowy-gen/src/main/resources/template/XnOracle.sql.vm index 8f023577..40b03a87 100644 --- a/snowy-base/snowy-gen/src/main/resources/template/XnOracle.sql.vm +++ b/snowy-base/snowy-gen/src/main/resources/template/XnOracle.sql.vm @@ -4,35 +4,35 @@ #foreach ($id in $sqlMenuId) #if($foreach.count == 1) INSERT INTO "sys_menu" VALUES -("$id", "0", "${menuPids}", "${functionName}", "${busName}_index", "1", null, "/${className}", "main/${busName}/index", null, "${appCode}", "1", "Y", null, null, "1", "100", null, "0", null, null, null, null); +("$id", "0", "[0],", "${functionName}", "${busName}_index", "1", null, "/${className}", "main/${busName}/index", null, "system_tool", "1", "Y", null, null, "1", "100", null, "0", null, null, null, null); #set ($pid=$id) #elseif($foreach.count == 2) INSERT INTO `sys_menu` VALUES -("$id", "$pid", "${menuPids}[$pid],", "${functionName}查询", "${busName}_index_page", "2", null, null, null, "${className}:page", "${appCode}", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); +("$id", "$pid", "[0],[$pid],", "${functionName}查询", "${busName}_index_page", "2", null, null, null, "${className}:page", "system_tool", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); #elseif($foreach.count == 3) INSERT INTO `sys_menu` VALUES -("$id", "$pid", "${menuPids}[$pid],", "${functionName}新增", "${busName}_index_add", "2", null, null, null, "${className}:add", "${appCode}", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); +("$id", "$pid", "[0],[$pid],", "${functionName}新增", "${busName}_index_add", "2", null, null, null, "${className}:add", "system_tool", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); #elseif($foreach.count == 4) INSERT INTO `sys_menu` VALUES -("$id", "$pid", "${menuPids}[$pid],", "${functionName}编辑", "${busName}_index_edit", "2", null, null, null, "${className}:edit", "${appCode}", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); +("$id", "$pid", "[0],[$pid],", "${functionName}编辑", "${busName}_index_edit", "2", null, null, null, "${className}:edit", "system_tool", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); #elseif($foreach.count == 5) INSERT INTO `sys_menu` VALUES -("$id", "$pid", "${menuPids}[$pid],", "${functionName}删除", "${busName}_index_delete", "2", null, null, null, "${className}:delete", "${appCode}", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); +("$id", "$pid", "[0],[$pid],", "${functionName}删除", "${busName}_index_delete", "2", null, null, null, "${className}:delete", "system_tool", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); #elseif($foreach.count == 6) INSERT INTO `sys_menu` VALUES -("$id", "$pid", "${menuPids}[$pid],", "${functionName}查看", "${busName}_index_detail", "2", null, null, null, "${className}:detail", "${appCode}", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); +("$id", "$pid", "[0],[$pid],", "${functionName}查看", "${busName}_index_detail", "2", null, null, null, "${className}:detail", "system_tool", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); #elseif($foreach.count == 7) INSERT INTO "sys_menu" VALUES -("$id", "$pid", "${menuPids}[$pid],", "${functionName}列表", "${busName}_index_list", "2", null, null, null, "${className}:list", "${appCode}", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); +("$id", "$pid", "[0],[$pid],", "${functionName}列表", "${busName}_index_list", "2", null, null, null, "${className}:list", "system_tool", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); #elseif($foreach.count == 7) INSERT INTO "sys_menu" VALUES -("$id", "$pid", "${menuPids}[$pid],", "${functionName}导出", "${busName}_index_export", "2", null, null, null, "${className}:export", "${appCode}", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); +("$id", "$pid", "[0],[$pid],", "${functionName}导出", "${busName}_index_export", "2", null, null, null, "${className}:export", "system_tool", "0", "Y", null, null, "1", "100", null, "0", null, null, null, null); #end #end