代码生成适配项目结构

hx-common/code-generator/src/main/java/com/fjhx/generator/CodeGenerator.java

@@ -38,7 +38,7 @@ public class CodeGenerator {
     public static void execute() {
 
         // 实体类所在模块
-        String entityChildren = "/hx-entity/" + DATABASE_NAME.replace("_", "-") + "-entity";
+        String entityChildren = "/hx-api/" + DATABASE_NAME.replace("_", "-") + "-api";
 
         //  业务所在模块
         String children = "/hx-serve/" + DATABASE_NAME.replace("_", "-");
@@ -114,6 +114,7 @@ public class CodeGenerator {
         templateConfig.setController("codeTemplates\\controller.java");
         templateConfig.setService("codeTemplates\\service.java");
         templateConfig.setServiceImpl("codeTemplates\\serviceImpl.java");
+        templateConfig.setMapper("codeTemplates\\mapper.java");
         templateConfig.setEntity(null);
 
         mpg.setTemplate(templateConfig);
@@ -122,7 +123,8 @@ public class CodeGenerator {
             @Override
             public void initMap() {
                 HashMap<String, Object> map = new HashMap<>();
-                map.put("voPath", parent + "." + moduleName + ".vo");
+                map.put("entityName", parent + ".entity." + moduleName);
+                map.put("voPath", parent + ".params." + moduleName);
                 setMap(map);
             }
         };
@@ -131,8 +133,8 @@ public class CodeGenerator {
         FileOutConfig entity = new FileOutConfig("/codeTemplates/entity.java.vm") {
             @Override
             public String outputFile(TableInfo tableInfo) {
-                return System.getProperty("user.dir") + entityChildren + "/src/main/java/com/fjhx/"
-                        + moduleName + "/entity/" + tableInfo.getEntityName() + ".java";
+                return System.getProperty("user.dir") + entityChildren + "/src/main/java/com/fjhx/entity/"
+                        + moduleName + "/" + tableInfo.getEntityName() + ".java";
             }
         };
 
@@ -140,12 +142,21 @@ public class CodeGenerator {
         FileOutConfig entityVo = new FileOutConfig("/codeTemplates/vo.java.vm") {
             @Override
             public String outputFile(TableInfo tableInfo) {
-                return System.getProperty("user.dir") + entityChildren + "/src/main/java/com/fjhx/"
-                        + moduleName + "/vo/" + tableInfo.getEntityName() + "Vo.java";
+                return System.getProperty("user.dir") + entityChildren + "/src/main/java/com/fjhx/params/"
+                        + moduleName + "/" + tableInfo.getEntityName() + "Vo.java";
             }
         };
 
-        ic.setFileOutConfigList(Arrays.asList(entity, entityVo));
+        // Ex模板配置
+        FileOutConfig entityEx = new FileOutConfig("/codeTemplates/ex.java.vm") {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return System.getProperty("user.dir") + entityChildren + "/src/main/java/com/fjhx/params/"
+                        + moduleName + "/" + tableInfo.getEntityName() + "Ex.java";
+            }
+        };
+
+        ic.setFileOutConfigList(Arrays.asList(entity, entityVo, entityEx));
         mpg.setCfg(ic);
 
         // 执行

hx-common/code-generator/src/main/resources/codeTemplates/controller.java.vm

@@ -2,7 +2,7 @@ package ${package.Controller};
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springblade.core.tool.api.R;
-import ${package.Entity}.${entity};
+import ${cfg.entityName}.${entity};
 import ${cfg.voPath}.${entity}Vo;
 import ${package.Service}.${table.serviceName};
 import org.springframework.beans.factory.annotation.Autowired;

hx-common/code-generator/src/main/resources/codeTemplates/entity.java.vm

@@ -1,4 +1,4 @@
-package ${package.Entity};
+package ${cfg.entityName};
 
 #foreach($pkg in ${table.importPackages})
 import ${pkg};

hx-common/code-generator/src/main/resources/codeTemplates/ex.java.vm

@@ -0,0 +1,17 @@
+package ${cfg.voPath};
+
+import ${cfg.entityName}.${entity};
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * $!{table.comment}
+ *
+ * @author ${author}
+ * @since ${date}
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ${entity}Ex extends ${entity} {
+
+}

hx-common/code-generator/src/main/resources/codeTemplates/mapper.java.vm

@@ -0,0 +1,20 @@
+package ${package.Mapper};
+
+import ${cfg.entityName}.${entity};
+import ${superMapperClassPackage};
+
+/**
+ * <p>
+ * $!{table.comment} Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since ${date}
+ */
+#if(${kotlin})
+interface ${table.mapperName} : ${superMapperClass}<${entity}>
+#else
+public interface ${table.mapperName} extends ${superMapperClass}<${entity}> {
+
+}
+#end

hx-common/code-generator/src/main/resources/codeTemplates/service.java.vm

@@ -1,7 +1,7 @@
 package ${package.Service};
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import ${package.Entity}.${entity};
+import ${cfg.entityName}.${entity};
 import ${cfg.voPath}.${entity}Vo;
 import ${superServiceClassPackage};
 

hx-common/code-generator/src/main/resources/codeTemplates/serviceImpl.java.vm

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.utils.WrapperUtil;
-import ${package.Entity}.${entity};
+import ${cfg.entityName}.${entity};
 import ${cfg.voPath}.${entity}Vo;
 import ${package.Mapper}.${table.mapperName};
 import ${package.Service}.${table.serviceName};

hx-common/code-generator/src/main/resources/codeTemplates/vo.java.vm

@@ -1,6 +1,6 @@
 package ${cfg.voPath};
 
-import ${package.Entity}.${entity};
+import ${cfg.entityName}.${entity};
 import lombok.Data;
 import lombok.EqualsAndHashCode;