From 61ef4c71bcb083f6169b1247b4f636b2a6f39f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 13 Jan 2023 23:35:46 +0800 Subject: [PATCH] =?UTF-8?q?remove=20=E5=88=A0=E9=99=A4=20=E4=B8=BB?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/constant/GenConstants.java | 5 - .../com/ruoyi/generator/domain/GenTable.java | 23 +--- .../service/GenTableServiceImpl.java | 34 ----- .../ruoyi/generator/util/VelocityUtils.java | 36 +----- .../main/resources/vm/java/sub-domain.java.vm | 76 ------------ .../src/main/resources/vm/vue/index.vue.vm | 109 ---------------- .../src/main/resources/vm/vue/v3/index.vue.vm | 116 ------------------ .../src/main/resources/vm/xml/mapper.xml.vm | 7 -- ruoyi-ui/src/views/tool/gen/genInfoForm.vue | 1 - 9 files changed, 7 insertions(+), 400 deletions(-) delete mode 100644 ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java index bb08d50a5..1f622cd45 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java @@ -16,11 +16,6 @@ public interface GenConstants { */ String TPL_TREE = "tree"; - /** - * 主子表（增删改查） - */ - String TPL_SUB = "sub"; - /** * 树编码字段 */ diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java index 1c739903c..14ff5aef3 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java @@ -1,15 +1,18 @@ package com.ruoyi.generator.domain; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.utils.StringUtils; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.ArrayUtils; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; import java.util.List; /** @@ -109,12 +112,6 @@ public class GenTable extends BaseEntity { @TableField(exist = false) private GenTableColumn pkColumn; - /** - * 子表信息 - */ - @TableField(exist = false) - private GenTable subTable; - /** * 表列信息 */ @@ -168,14 +165,6 @@ public class GenTable extends BaseEntity { @TableField(exist = false) private String parentMenuName; - public boolean isSub() { - return isSub(this.tplCategory); - } - - public static boolean isSub(String tplCategory) { - return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory); - } - public boolean isTree() { return isTree(this.tplCategory); } diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java index 085589fb2..0836d1927 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java @@ -210,8 +210,6 @@ public class GenTableServiceImpl implements IGenTableService { menuIds.add(identifierGenerator.nextId(null).longValue()); } table.setMenuIds(menuIds); - // 设置主子表信息 - setSubTable(table); // 设置主键列信息 setPkColumn(table); VelocityInitializer.initVelocity(); @@ -254,8 +252,6 @@ public class GenTableServiceImpl implements IGenTableService { public void generatorCode(String tableName) { // 查询表信息 GenTable table = baseMapper.selectGenTableByName(tableName); - // 设置主子表信息 - setSubTable(table); // 设置主键列信息 setPkColumn(table); @@ -360,8 +356,6 @@ public class GenTableServiceImpl implements IGenTableService { menuIds.add(identifierGenerator.nextId(null).longValue()); } table.setMenuIds(menuIds); - // 设置主子表信息 - setSubTable(table); // 设置主键列信息 setPkColumn(table); @@ -405,12 +399,6 @@ public class GenTableServiceImpl implements IGenTableService { throw new ServiceException("树父编码字段不能为空"); } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_NAME))) { throw new ServiceException("树名称字段不能为空"); - } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) { - if (StringUtils.isEmpty(genTable.getSubTableName())) { - throw new ServiceException("关联子表的表名不能为空"); - } else if (StringUtils.isEmpty(genTable.getSubTableFkName())) { - throw new ServiceException("子表关联的外键名不能为空"); - } } } } @@ -430,29 +418,7 @@ public class GenTableServiceImpl implements IGenTableService { if (ObjectUtil.isNull(table.getPkColumn())) { table.setPkColumn(table.getColumns().get(0)); } - if (GenConstants.TPL_SUB.equals(table.getTplCategory())) { - for (GenTableColumn column : table.getSubTable().getColumns()) { - if (column.isPk()) { - table.getSubTable().setPkColumn(column); - break; - } - } - if (ObjectUtil.isNull(table.getSubTable().getPkColumn())) { - table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0)); - } - } - } - /** - * 设置主子表信息 - * - * @param table 业务表信息 - */ - public void setSubTable(GenTable table) { - String subTableName = table.getSubTableName(); - if (StringUtils.isNotEmpty(subTableName)) { - table.setSubTable(baseMapper.selectGenTableByName(subTableName)); - } } /** diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java index d8eeb6dd7..e5bb87f4a 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java @@ -3,7 +3,6 @@ package com.ruoyi.generator.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Dict; -import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.helper.DataBaseHelper; import com.ruoyi.common.utils.DateUtils; @@ -75,9 +74,6 @@ public class VelocityUtils { if (GenConstants.TPL_TREE.equals(tplCategory)) { setTreeVelocityContext(velocityContext, genTable); } - if (GenConstants.TPL_SUB.equals(tplCategory)) { - setSubVelocityContext(velocityContext, genTable); - } return velocityContext; } @@ -107,23 +103,6 @@ public class VelocityUtils { } } - public static void setSubVelocityContext(VelocityContext context, GenTable genTable) { - GenTable subTable = genTable.getSubTable(); - String subTableName = genTable.getSubTableName(); - String subTableFkName = genTable.getSubTableFkName(); - String subClassName = genTable.getSubTable().getClassName(); - String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName); - - context.put("subTable", subTable); - context.put("subTableName", subTableName); - context.put("subTableFkName", subTableFkName); - context.put("subTableFkClassName", subTableFkClassName); - context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName)); - context.put("subClassName", subClassName); - context.put("subclassName", StringUtils.uncapitalize(subClassName)); - context.put("subImportList", getImportList(genTable.getSubTable())); - } - /** * 获取模板信息 * @@ -153,9 +132,6 @@ public class VelocityUtils { templates.add("vm/vue/index.vue.vm"); } else if (GenConstants.TPL_TREE.equals(tplCategory)) { templates.add("vm/vue/index-tree.vue.vm"); - } else if (GenConstants.TPL_SUB.equals(tplCategory)) { - templates.add("vm/vue/index.vue.vm"); - templates.add("vm/java/sub-domain.java.vm"); } return templates; } @@ -188,9 +164,7 @@ public class VelocityUtils { if (template.contains("bo.java.vm")) { fileName = StringUtils.format("{}/domain/bo/{}Bo.java", javaPath, className); } - if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) { - fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName()); - } else if (template.contains("mapper.java.vm")) { + if (template.contains("mapper.java.vm")) { fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); } else if (template.contains("service.java.vm")) { fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className); @@ -231,11 +205,7 @@ public class VelocityUtils { */ public static HashSet getImportList(GenTable genTable) { List columns = genTable.getColumns(); - GenTable subGenTable = genTable.getSubTable(); HashSet importList = new HashSet(); - if (ObjectUtil.isNotNull(subGenTable)) { - importList.add("java.util.List"); - } for (GenTableColumn column : columns) { if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) { importList.add("java.util.Date"); @@ -257,10 +227,6 @@ public class VelocityUtils { List columns = genTable.getColumns(); Set dicts = new HashSet(); addDicts(dicts, columns); - if (ObjectUtil.isNotNull(genTable.getSubTable())) { - List subColumns = genTable.getSubTable().getColumns(); - addDicts(dicts, subColumns); - } return StringUtils.join(dicts, ", "); } diff --git a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm deleted file mode 100644 index b5e308cf7..000000000 --- a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm +++ /dev/null @@ -1,76 +0,0 @@ -package ${packageName}.domain; - -#foreach ($import in $subImportList) -import ${import}; -#end -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * ${subTable.functionName}对象 ${subTableName} - * - * @author ${author} - * @date ${datetime} - */ -public class ${subClassName} extends BaseEntity -{ - private static final long serialVersionUID = 1L; - -#foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) - /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end - private $column.javaType $column.javaField; - -#end -#end -#foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } - - public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end -#end - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $subTable.columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end - .toString(); - } -} diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index e645b6bb8..9f0131b71 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -281,65 +281,6 @@ #end #end -#end -#if($table.sub) - ${subTable.functionName}信息 - - - 添加 - - - 删除 - - - - - -#foreach($column in $subTable.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 || $javaField == ${subTableFkclassName}) -#elseif($column.list && $column.htmlType == "input") - - - -#elseif($column.list && $column.htmlType == "datetime") - - - -#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType) - - - -#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType) - - - -#end -#end - #end
@@ -366,10 +307,6 @@ export default { loading: true, // 选中数组 ids: [], -#if($table.sub) - // 子表选中数据 - checked${subClassName}: [], -#end // 非单个禁用 single: true, // 非多个禁用 @@ -380,10 +317,6 @@ export default { total: 0, // ${functionName}表格数据 ${businessName}List: [], -#if($table.sub) - // ${subTable.functionName}表格数据 - ${subclassName}List: [], -#end // 弹出层标题 title: "", // 是否显示弹出层 @@ -469,9 +402,6 @@ export default { #end #end }; -#if($table.sub) - this.${subclassName}List = []; -#end this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -514,9 +444,6 @@ export default { #if($column.htmlType == "checkbox") this.form.$column.javaField = this.form.${column.javaField}.split(","); #end -#end -#if($table.sub) - this.${subclassName}List = response.data.${subclassName}List; #end this.open = true; this.title = "修改${functionName}"; @@ -531,9 +458,6 @@ export default { #if($column.htmlType == "checkbox") this.form.$column.javaField = this.form.${column.javaField}.join(","); #end -#end -#if($table.sub) - this.form.${subclassName}List = this.${subclassName}List; #end if (this.form.${pkColumn.javaField} != null) { update${BusinessName}(this.form).then(response => { @@ -570,39 +494,6 @@ export default { this.loading = false; }); }, -#if($table.sub) - /** ${subTable.functionName}序号 */ - row${subClassName}Index({ row, rowIndex }) { - row.index = rowIndex + 1; - }, - /** ${subTable.functionName}添加按钮操作 */ - handleAdd${subClassName}() { - let obj = {}; -#foreach($column in $subTable.columns) -#if($column.pk || $column.javaField == ${subTableFkclassName}) -#elseif($column.list && "" != $javaField) - obj.$column.javaField = ""; -#end -#end - this.${subclassName}List.push(obj); - }, - /** ${subTable.functionName}删除按钮操作 */ - handleDelete${subClassName}() { - if (this.checked${subClassName}.length == 0) { - this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据"); - } else { - const ${subclassName}List = this.${subclassName}List; - const checked${subClassName} = this.checked${subClassName}; - this.${subclassName}List = ${subclassName}List.filter(function(item) { - return checked${subClassName}.indexOf(item.index) == -1 - }); - } - }, - /** 复选框选中数据 */ - handle${subClassName}SelectionChange(selection) { - this.checked${subClassName} = selection.map(item => item.index) - }, -#end /** 导出按钮操作 */ handleExport() { this.download('${moduleName}/${businessName}/export', { diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm index a93922ef5..9ddcbc363 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm @@ -264,70 +264,6 @@ #end #end -#end -#if($table.sub) - ${subTable.functionName}信息 - - - 添加 - - - 删除 - - - - - -#foreach($column in $subTable.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 || $javaField == ${subTableFkclassName}) -#elseif($column.list && $column.htmlType == "input") - - - -#elseif($column.list && $column.htmlType == "datetime") - - - -#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType) - - - -#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType) - - - -#end -#end - #end