修改代码生成

src/main/java/org/springblade/common/generator/BladeCodeGenerator.java

@@ -0,0 +1,307 @@
+package org.springblade.common.generator;
+
+/**
+ * Author pangqijun
+ * Date 2023/2/7
+ * Description
+ */
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
+import com.baomidou.mybatisplus.generator.config.FileOutConfig;
+import com.baomidou.mybatisplus.generator.config.GlobalConfig;
+import com.baomidou.mybatisplus.generator.config.PackageConfig;
+import com.baomidou.mybatisplus.generator.config.StrategyConfig;
+import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
+import com.baomidou.mybatisplus.generator.config.converts.OracleTypeConvert;
+import com.baomidou.mybatisplus.generator.config.converts.PostgreSqlTypeConvert;
+import com.baomidou.mybatisplus.generator.config.converts.SqlServerTypeConvert;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import lombok.Data;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PropertiesLoaderUtils;
+
+@Data
+public class BladeCodeGenerator {
+    private static final Logger log = LoggerFactory.getLogger(BladeCodeGenerator.class);
+    private String systemName = "sword";
+    private String codeName;
+    private String serviceName = "blade-service";
+    private String packageName = "org.springblade.test";
+    private String packageDir;
+    private String packageWebDir;
+    private String[] tablePrefix = new String[]{"blade_"};
+    private String[] includeTables = new String[]{"blade_test"};
+    private String[] excludeTables = new String[0];
+    private Boolean hasSuperEntity;
+    private Boolean hasWrapper;
+    private String[] superEntityColumns;
+    private String tenantColumn;
+    private Boolean isSwagger2;
+    private String driverName;
+    private String url;
+    private String username;
+    private String password;
+
+    public void run() {
+        Properties props = this.getProperties();
+        AutoGenerator mpg = new AutoGenerator();
+        GlobalConfig gc = new GlobalConfig();
+        String outputDir = this.getOutputDir();
+        String author = props.getProperty("author");
+        gc.setOutputDir(outputDir);
+        gc.setAuthor(author);
+        gc.setFileOverride(true);
+        gc.setOpen(false);
+        gc.setActiveRecord(false);
+        gc.setEnableCache(false);
+        gc.setBaseResultMap(true);
+        gc.setBaseColumnList(true);
+        gc.setMapperName("%sMapper");
+        gc.setXmlName("%sMapper");
+        gc.setServiceName("I%sService");
+        gc.setServiceImplName("%sServiceImpl");
+        gc.setControllerName("%sController");
+        gc.setSwagger2(this.isSwagger2);
+        mpg.setGlobalConfig(gc);
+        DataSourceConfig dsc = new DataSourceConfig();
+        String driverName = Func.toStr(this.driverName, props.getProperty("spring.datasource.driver-class-name"));
+        if (StringUtil.containsAny(driverName, new CharSequence[]{DbType.MYSQL.getDb()})) {
+            dsc.setDbType(DbType.MYSQL);
+            dsc.setTypeConvert(new MySqlTypeConvert());
+        } else if (StringUtil.containsAny(driverName, new CharSequence[]{DbType.POSTGRE_SQL.getDb()})) {
+            dsc.setDbType(DbType.POSTGRE_SQL);
+            dsc.setTypeConvert(new PostgreSqlTypeConvert());
+        } else if (StringUtil.containsAny(driverName, new CharSequence[]{DbType.SQL_SERVER.getDb()})) {
+            dsc.setDbType(DbType.SQL_SERVER);
+            dsc.setTypeConvert(new SqlServerTypeConvert());
+        } else {
+            dsc.setDbType(DbType.ORACLE);
+            dsc.setTypeConvert(new OracleTypeConvert());
+        }
+
+        dsc.setDriverName(driverName);
+        dsc.setUrl(Func.toStr(this.url, props.getProperty("spring.datasource.url")));
+        dsc.setUsername(Func.toStr(this.username, props.getProperty("spring.datasource.username")));
+        dsc.setPassword(Func.toStr(this.password, props.getProperty("spring.datasource.password")));
+        mpg.setDataSource(dsc);
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setTablePrefix(this.tablePrefix);
+        if (this.includeTables.length > 0) {
+            strategy.setInclude(this.includeTables);
+        }
+
+        if (this.excludeTables.length > 0) {
+            strategy.setExclude(this.excludeTables);
+        }
+
+        if (this.hasSuperEntity) {
+            strategy.setSuperEntityClass("org.springblade.common.base.BaseEntity");
+            strategy.setSuperEntityColumns(this.superEntityColumns);
+            strategy.setSuperServiceClass("com.baomidou.mybatisplus.extension.service.IService");
+            strategy.setSuperServiceImplClass("com.baomidou.mybatisplus.extension.service.impl.ServiceImpl");
+        } else {
+            strategy.setSuperServiceClass("com.baomidou.mybatisplus.extension.service.IService");
+            strategy.setSuperServiceImplClass("com.baomidou.mybatisplus.extension.service.impl.ServiceImpl");
+        }
+
+        strategy.setSuperControllerClass("org.springblade.core.boot.ctrl.BladeController");
+        strategy.setEntityBuilderModel(false);
+        strategy.setEntityLombokModel(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        mpg.setStrategy(strategy);
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName((String) null);
+        pc.setParent(this.packageName);
+        pc.setController("controller");
+        pc.setEntity("entity");
+        pc.setXml("mapper");
+        mpg.setPackageInfo(pc);
+        mpg.setCfg(this.getInjectionConfig());
+        mpg.execute();
+    }
+
+    private InjectionConfig getInjectionConfig() {
+        final String servicePackage = this.serviceName.split("-").length > 1 ? this.serviceName.split("-")[1] : this.serviceName;
+        final Map<String, Object> map = new HashMap(16);
+        InjectionConfig cfg = new InjectionConfig() {
+            public void initMap() {
+                map.put("codeName", BladeCodeGenerator.this.codeName);
+                map.put("serviceName", BladeCodeGenerator.this.serviceName);
+                map.put("servicePackage", servicePackage);
+                map.put("servicePackageLowerCase", servicePackage.toLowerCase());
+                map.put("tenantColumn", BladeCodeGenerator.this.tenantColumn);
+                map.put("hasWrapper", BladeCodeGenerator.this.hasWrapper);
+                this.setMap(map);
+            }
+        };
+        List<FileOutConfig> focList = new ArrayList();
+        String sqlPath = "/templates/sql/menu.sql.vm";
+        if (Func.equals(this.systemName, "lemon")) {
+            sqlPath = "/templates/lemon/menu.sql.vm";
+        }
+
+        focList.add(new FileOutConfig(sqlPath) {
+            public String outputFile(TableInfo tableInfo) {
+                map.put("entityKey", tableInfo.getEntityName().toLowerCase());
+                map.put("menuId", IdWorker.getId());
+                map.put("addMenuId", IdWorker.getId());
+                map.put("editMenuId", IdWorker.getId());
+                map.put("removeMenuId", IdWorker.getId());
+                map.put("viewMenuId", IdWorker.getId());
+                return BladeCodeGenerator.this.getOutputDir() + "//sql/" + tableInfo.getEntityName().toLowerCase() + ".menu.mysql";
+            }
+        });
+        focList.add(new FileOutConfig("/templates/entityVO.java.vm") {
+            public String outputFile(TableInfo tableInfo) {
+                return BladeCodeGenerator.this.getOutputDir() + "/" + BladeCodeGenerator.this.packageName.replace(".", "/") + "/vo/" + tableInfo.getEntityName() + "VO" + ".java";
+            }
+        });
+        focList.add(new FileOutConfig("/templates/entityDTO.java.vm") {
+            public String outputFile(TableInfo tableInfo) {
+                return BladeCodeGenerator.this.getOutputDir() + "/" + BladeCodeGenerator.this.packageName.replace(".", "/") + "/dto/" + tableInfo.getEntityName() + "DTO" + ".java";
+            }
+        });
+        if (this.hasWrapper) {
+            focList.add(new FileOutConfig("/templates/wrapper.java.vm") {
+                public String outputFile(TableInfo tableInfo) {
+                    return BladeCodeGenerator.this.getOutputDir() + "/" + BladeCodeGenerator.this.packageName.replace(".", "/") + "/wrapper/" + tableInfo.getEntityName() + "Wrapper" + ".java";
+                }
+            });
+        }
+
+        if (Func.isNotBlank(this.packageWebDir)) {
+            if (Func.equals(this.systemName, "sword")) {
+                focList.add(new FileOutConfig("/templates/sword/action.js.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/actions/" + tableInfo.getEntityName().toLowerCase() + ".js";
+                    }
+                });
+                focList.add(new FileOutConfig("/templates/sword/model.js.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/models/" + tableInfo.getEntityName().toLowerCase() + ".js";
+                    }
+                });
+                focList.add(new FileOutConfig("/templates/sword/service.js.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/services/" + tableInfo.getEntityName().toLowerCase() + ".js";
+                    }
+                });
+                focList.add(new FileOutConfig("/templates/sword/list.js.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/pages/" + StringUtil.firstCharToUpper(servicePackage) + "/" + tableInfo.getEntityName() + "/" + tableInfo.getEntityName() + ".js";
+                    }
+                });
+                focList.add(new FileOutConfig("/templates/sword/add.js.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/pages/" + StringUtil.firstCharToUpper(servicePackage) + "/" + tableInfo.getEntityName() + "/" + tableInfo.getEntityName() + "Add.js";
+                    }
+                });
+                focList.add(new FileOutConfig("/templates/sword/edit.js.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/pages/" + StringUtil.firstCharToUpper(servicePackage) + "/" + tableInfo.getEntityName() + "/" + tableInfo.getEntityName() + "Edit.js";
+                    }
+                });
+                focList.add(new FileOutConfig("/templates/sword/view.js.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/pages/" + StringUtil.firstCharToUpper(servicePackage) + "/" + tableInfo.getEntityName() + "/" + tableInfo.getEntityName() + "View.js";
+                    }
+                });
+            } else if (Func.equals(this.systemName, "saber")) {
+                focList.add(new FileOutConfig("/templates/saber/api.js.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/api/" + servicePackage.toLowerCase() + "/" + tableInfo.getEntityName().toLowerCase() + ".js";
+                    }
+                });
+                focList.add(new FileOutConfig("/templates/saber/crud.vue.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/views/" + servicePackage.toLowerCase() + "/" + tableInfo.getEntityName().toLowerCase() + ".vue";
+                    }
+                });
+            } else if (Func.equals(this.systemName, "lemon")) {
+                focList.add(new FileOutConfig("/templates/lemon/data.ts.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/api/" + servicePackage.toLowerCase() + "/" + tableInfo.getEntityName().toLowerCase() + ".ts";
+                    }
+                });
+                focList.add(new FileOutConfig("/templates/lemon/data.data.ts.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/views/" + servicePackage.toLowerCase() + "/" + tableInfo.getEntityName().toLowerCase() + "/" + tableInfo.getEntityName().toLowerCase() + ".data.ts";
+                    }
+                });
+                focList.add(new FileOutConfig("/templates/lemon/index.vue.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/views/" + servicePackage.toLowerCase() + "/" + tableInfo.getEntityName().toLowerCase() + "/index.vue";
+                    }
+                });
+                focList.add(new FileOutConfig("/templates/lemon/Modal.vue.vm") {
+                    public String outputFile(TableInfo tableInfo) {
+                        return BladeCodeGenerator.this.getOutputWebDir() + "/views/" + servicePackage.toLowerCase() + "/" + tableInfo.getEntityName().toLowerCase() + "/" + tableInfo.getEntityName() + "Modal.vue";
+                    }
+                });
+            }
+        }
+
+        cfg.setFileOutConfigList(focList);
+        return cfg;
+    }
+
+    private Properties getProperties() {
+        Resource resource = new ClassPathResource("/templates/code.properties");
+        Properties props = new Properties();
+
+        try {
+            props = PropertiesLoaderUtils.loadProperties(resource);
+        } catch (IOException var4) {
+            var4.printStackTrace();
+        }
+
+        return props;
+    }
+
+    public String getOutputDir() {
+        return (Func.isBlank(this.packageDir) ? System.getProperty("user.dir") + "/blade-ops/blade-develop" : this.packageDir) + "/src/main/java";
+    }
+
+    public String getOutputWebDir() {
+        return (Func.isBlank(this.packageWebDir) ? System.getProperty("user.dir") : this.packageWebDir) + "/src";
+    }
+
+    private String getGeneratorViewPath(String viewOutputDir, TableInfo tableInfo, String suffixPath) {
+        String name = StringUtils.firstToLowerCase(tableInfo.getEntityName());
+        String path = viewOutputDir + "/" + name + "/" + name + suffixPath;
+        File viewDir = (new File(path)).getParentFile();
+        if (!viewDir.exists()) {
+            viewDir.mkdirs();
+        }
+
+        return path;
+    }
+
+    public BladeCodeGenerator() {
+        this.hasSuperEntity = Boolean.FALSE;
+        this.hasWrapper = Boolean.FALSE;
+        this.superEntityColumns = new String[]{"id", "create_user_id", "update_user_id", "create_time", "update_time", "is_delete"};
+        this.tenantColumn = "tenant_id";
+        this.isSwagger2 = Boolean.TRUE;
+    }
+}

src/main/java/org/springblade/modules/develop/controller/CodeController.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
+import org.springblade.common.generator.BladeCodeGenerator;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
@@ -29,7 +30,6 @@ import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.develop.support.BladeCodeGenerator;
 import org.springblade.modules.develop.entity.Code;
 import org.springblade.modules.develop.entity.Datasource;
 import org.springblade.modules.develop.service.ICodeService;
@@ -148,6 +148,8 @@ public class CodeController extends BladeController {
 			generator.setHasSuperEntity(code.getBaseMode() == 2);
 			// 设置是否开启包装器模式
 			generator.setHasWrapper(code.getWrapMode() == 2);
+			generator.setIsSwagger2(true);
+			generator.setHasSuperEntity(true);
 			generator.run();
 		});
 		return R.success("代码生成成功");

src/main/resources/templates/controller.java.vm

@@ -161,7 +161,7 @@ public class $!{table.controllerName} {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status($!{table.entityPath}Service.deleteLogic(Func.toLongList(ids)));
+		return R.status($!{table.entityPath}Service.removeByIds(Func.toLongList(ids)));
 	}
 
 	#else

src/main/resources/templates/entity.java.vm

@@ -0,0 +1,146 @@
+package $!{package.Entity};
+
+#foreach($pkg in $!{table.importPackages})
+import $!{pkg};
+#end
+#if($!{entityLombokModel})
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+#end
+#if($!{swagger2})
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+#end
+
+/**
+ * $!{table.comment}实体类
+ *
+ * @author zzyd
+ * @since $!{date}
+ */
+#if($!{entityLombokModel})
+@Data
+#end
+#if($!{table.convert})
+@TableName("$!{table.name}")
+#end
+#if($!{superEntityClass})
+@EqualsAndHashCode(callSuper = true)
+#end
+#if($!{swagger2})
+@ApiModel(value = "$!{entity}对象", description = #if ("$!{table.comment}"=="")"$!{entity}对象"#else"$!{table.comment}"#end)
+#end
+#if($!{superEntityClass})
+public class $!{entity} extends $!{superEntityClass}#if($!{activeRecord})<$!{entity}>#end {
+#elseif($!{activeRecord})
+@Accessors(chain = true)
+public class $!{entity} extends Model<$!{entity}> {
+#else
+public class $!{entity} implements Serializable {
+#end
+
+	private static final long serialVersionUID = 1L;
+
+## ----------  BEGIN 字段循环遍历  ----------
+#foreach($field in $!{table.fields})
+#if($!{field.name}!=$!{cfg.tenantColumn})
+#if($!{field.keyFlag})
+#set($keyPropertyName=$!{field.propertyName})
+#end
+#if("$!field.comment" != "")
+	/**
+	* $!{field.comment}
+	*/
+	#if($!{swagger2})@ApiModelProperty(value = "$!{field.comment}")
+	#end
+#end
+#if($!{field.keyFlag})
+## 主键
+#if($!{field.keyIdentityFlag})
+	@TableId(value = "$!{field.name}", type = IdType.AUTO)
+#elseif(!$null.isNull($!{idType}) && "$!idType" != "")
+	@TableId(value = "$!{field.name}", type = IdType.$!{idType})
+#elseif($!{field.convert})
+	@TableId("$!{field.name}")
+#end
+## 普通字段
+#elseif($!{field.fill})
+## -----   存在字段填充设置   -----
+#if($!{field.convert})
+	@TableField(value = "$!{field.name}", fill = FieldFill.$!{field.fill})
+#else
+	@TableField(fill = FieldFill.$!{field.fill})
+#end
+#elseif($!{field.convert})
+	@TableField("$!{field.name}")
+#end
+## 乐观锁注解
+#if($!{versionFieldName}==$!{field.name})
+	@Version
+#end
+## 逻辑删除注解
+#if($!{logicDeleteFieldName}==$!{field.name})
+	@TableLogic
+#end
+private $!{field.propertyType} $!{field.propertyName};
+#end
+#end
+## ----------  END 字段循环遍历  ----------
+
+#if(!$!{entityLombokModel})
+#foreach($field in $!{table.fields})
+#if($!{field.propertyType.equals("boolean")})
+#set($getprefix="is")
+#else
+#set($getprefix="get")
+#end
+
+	public $!{field.propertyType} $!{getprefix}$!{field.capitalName}() {
+		return $!{field.propertyName};
+	}
+
+#if($!{entityBuilderModel})
+	public $!{entity} set$!{field.capitalName}($!{field.propertyType} $!{field.propertyName}) {
+#else
+	public void set$!{field.capitalName}($!{field.propertyType} $!{field.propertyName}) {
+#end
+		this.$!{field.propertyName} = $!{field.propertyName};
+#if($!{entityBuilderModel})
+		return this;
+#end
+	}
+#end
+#end
+
+#if($!{entityColumnConstant})
+#foreach($field in $!{table.fields})
+	public static final String $!{field.name.toUpperCase()} = "$!{field.name}";
+
+#end
+#end
+#if($!{activeRecord})
+	@Override
+	protected Serializable pkVal() {
+#if($!{keyPropertyName})
+		return this.$!{keyPropertyName};
+#else
+		return this.id;
+#end
+	}
+
+#end
+#if(!$!{entityLombokModel})
+	@Override
+	public String toString() {
+		return "$!{entity}{" +
+#foreach($field in $!{table.fields})
+#if($!{velocityCount}==1)
+		"$!{field.propertyName}=" + $!{field.propertyName} +
+#else
+		", $!{field.propertyName}=" + $!{field.propertyName} +
+#end
+#end
+		"}";
+	}
+#end
+}